diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/chrome/common/extensions/api | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
| download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/chrome/common/extensions/api')
| -rw-r--r-- | chromium/chrome/common/extensions/api/api.gyp | 58 |
1 files changed, 52 insertions, 6 deletions
diff --git a/chromium/chrome/common/extensions/api/api.gyp b/chromium/chrome/common/extensions/api/api.gyp index 465021ae042..7fddbf97e90 100644 --- a/chromium/chrome/common/extensions/api/api.gyp +++ b/chromium/chrome/common/extensions/api/api.gyp @@ -30,6 +30,7 @@ 'bluetooth.idl', 'bookmark_manager_private.json', 'bookmarks.json', + 'braille_display_private.idl', 'browsing_data.json', 'chromeos_info_private.json', 'cloud_print_private.json', @@ -39,8 +40,10 @@ 'cookies.json', 'debugger.json', 'developer_private.idl', + 'desktop_capture.idl', 'diagnostics.idl', 'dial.idl', + 'dns.idl', 'downloads.idl', 'echo_private.json', 'downloads_internal.idl', @@ -48,10 +51,9 @@ 'events.json', 'experimental_accessibility.json', 'experimental_discovery.idl', - 'experimental_dns.idl', 'experimental_history.json', 'experimental_identity.idl', - 'experimental_idltest.idl', + 'file_browser_private.json', 'location.idl', 'system_memory.idl', 'extension.json', @@ -64,11 +66,13 @@ 'identity.idl', 'identity_private.idl', 'idle.json', + 'idltest.idl', 'infobars.json', 'input_ime.json', 'log_private.idl', 'management.json', 'manifest_types.json', + 'mdns.idl', 'media_galleries.idl', 'media_galleries_private.idl', 'media_player_private.json', @@ -82,12 +86,14 @@ 'preferences_private.json', 'power.idl', 'push_messaging.idl', - 'recovery_private.idl', + 'image_writer_private.idl', 'rtc_private.idl', 'runtime.json', 'serial.idl', - 'session_restore.json', + 'sessions.json', + 'signed_in_devices.idl', 'socket.idl', + 'sockets_udp.idl', 'storage.json', 'sync_file_system.idl', 'system_indicator.idl', @@ -101,6 +107,8 @@ 'test.json', 'top_sites.json', 'usb.idl', + 'virtual_keyboard_private.json', + 'wallpaper.json', 'wallpaper_private.json', 'web_navigation.json', 'web_request.json', @@ -117,8 +125,43 @@ ], 'conditions': [ ['OS=="android"', { - 'schema_files!': [ - 'usb.idl', + 'sources!': [ + 'autotest_private.idl', + 'bookmark_manager_private.json', + 'browsing_data.json', + 'chromeos_info_private.json', + 'command_line_private.json', + 'developer_private.idl', + 'dial.idl', + 'downloads_internal.idl', + 'echo_private.json', + 'enterprise_platform_keys_private.json', + 'experimental_accessibility.json', + 'experimental_discovery.idl', + 'experimental_dns.idl', + 'experimental_history.json', + 'experimental_identity.idl', + 'experimental_idltest.idl', + 'extension.json', + 'file_browser_handler_internal.json', + 'font_settings.json', + 'i18n.json', + 'identity.idl', + 'identity_private.idl', + 'idle.json', + 'infobars.json', + 'input_ime.json', + 'media_player_private.json', + 'music_manager_private.idl', + 'networking_private.json', + 'power.idl', + 'rtc_private.idl', + 'system_indicator.idl', + 'system_private.json', + 'terminal_private.json', + 'test.json', + 'top_sites.json', + 'webview.json', ], }], ['OS!="chromeos"', { @@ -126,6 +169,9 @@ 'file_browser_handler_internal.json', 'log_private.idl', 'rtc_private.idl', + 'virtual_keyboard_private.json', + 'wallpaper.json', + 'wallpaper_private.json', ], }], ], |