Merge from Chromium at DEPS revision r198571
This commit was generated by merge_to_master.py.
Change-Id: I951118a03836157090561764dd2627f0add8118f
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 6b4f375..1b50b43 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -47,8 +47,7 @@
'<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
'<(DEPTH)/third_party/mt19937ar/mt19937ar.gyp:mt19937ar',
'<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
- '<(DEPTH)/third_party/zlib/zlib.gyp:minizip',
- '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
+ '<(DEPTH)/third_party/zlib/zlib.gyp:zip',
'<(DEPTH)/ui/ui.gyp:ui_resources',
'<(DEPTH)/webkit/support/webkit_support.gyp:user_agent',
],
@@ -68,6 +67,8 @@
'../extensions/common/event_filtering_info.h',
'../extensions/common/event_matcher.cc',
'../extensions/common/event_matcher.h',
+ '../extensions/common/extension_paths.cc',
+ '../extensions/common/extension_paths.h',
'../extensions/common/extension_resource.cc',
'../extensions/common/extension_resource.h',
'../extensions/common/id_util.cc',
@@ -92,6 +93,8 @@
'../extensions/common/url_pattern.h',
'../extensions/common/url_pattern_set.cc',
'../extensions/common/url_pattern_set.h',
+ '../extensions/common/view_type.cc',
+ '../extensions/common/view_type.h',
'common/all_messages.h',
'common/attrition_experiments.h',
'common/auto_start_linux.cc',
@@ -175,12 +178,12 @@
'common/extensions/api/file_handlers/file_handlers_parser.h',
'common/extensions/api/i18n/default_locale_handler.cc',
'common/extensions/api/i18n/default_locale_handler.h',
- 'common/extensions/api/icons/icons_handler.cc',
- 'common/extensions/api/icons/icons_handler.h',
'common/extensions/api/identity/oauth2_manifest_handler.cc',
'common/extensions/api/identity/oauth2_manifest_handler.h',
'common/extensions/api/input_ime/input_components_handler.cc',
'common/extensions/api/input_ime/input_components_handler.h',
+ 'common/extensions/api/managed_mode_private/managed_mode_handler.cc',
+ 'common/extensions/api/managed_mode_private/managed_mode_handler.h',
'common/extensions/api/omnibox/omnibox_handler.cc',
'common/extensions/api/omnibox/omnibox_handler.h',
'common/extensions/api/page_launcher/page_launcher_handler.cc',
@@ -189,12 +192,14 @@
'common/extensions/api/plugins/plugins_handler.h',
'common/extensions/api/speech/tts_engine_manifest_handler.cc',
'common/extensions/api/speech/tts_engine_manifest_handler.h',
+ 'common/extensions/api/spellcheck/spellcheck_handler.cc',
+ 'common/extensions/api/spellcheck/spellcheck_handler.h',
'common/extensions/api/system_indicator/system_indicator_handler.cc',
'common/extensions/api/system_indicator/system_indicator_handler.h',
- 'common/extensions/api/themes/theme_handler.cc',
- 'common/extensions/api/themes/theme_handler.h',
'common/extensions/background_info.cc',
'common/extensions/background_info.h',
+ 'common/extensions/chrome_manifest_handlers.cc',
+ 'common/extensions/chrome_manifest_handlers.h',
'common/extensions/command.cc',
'common/extensions/command.h',
'common/extensions/csp_handler.cc',
@@ -223,6 +228,8 @@
'common/extensions/extension_set.h',
'common/extensions/feature_switch.cc',
'common/extensions/feature_switch.h',
+ 'common/extensions/features/api_feature.cc',
+ 'common/extensions/features/api_feature.h',
'common/extensions/features/base_feature_provider.cc',
'common/extensions/features/base_feature_provider.h',
'common/extensions/features/complex_feature.cc',
@@ -244,8 +251,26 @@
'common/extensions/manifest_handler.h',
'common/extensions/manifest_handler_helpers.cc',
'common/extensions/manifest_handler_helpers.h',
+ 'common/extensions/manifest_handlers/app_isolation_info.cc',
+ 'common/extensions/manifest_handlers/app_isolation_info.h',
'common/extensions/manifest_handlers/content_scripts_handler.cc',
'common/extensions/manifest_handlers/content_scripts_handler.h',
+ 'common/extensions/manifest_handlers/externally_connectable.cc',
+ 'common/extensions/manifest_handlers/externally_connectable.h',
+ 'common/extensions/manifest_handlers/icons_handler.cc',
+ 'common/extensions/manifest_handlers/icons_handler.h',
+ 'common/extensions/manifest_handlers/kiosk_enabled_info.cc',
+ 'common/extensions/manifest_handlers/kiosk_enabled_info.h',
+ 'common/extensions/manifest_handlers/offline_enabled_info.cc',
+ 'common/extensions/manifest_handlers/offline_enabled_info.h',
+ 'common/extensions/manifest_handlers/requirements_handler.cc',
+ 'common/extensions/manifest_handlers/requirements_handler.h',
+ 'common/extensions/manifest_handlers/sandboxed_page_info.cc',
+ 'common/extensions/manifest_handlers/sandboxed_page_info.h',
+ 'common/extensions/manifest_handlers/shared_module_info.cc',
+ 'common/extensions/manifest_handlers/shared_module_info.h',
+ 'common/extensions/manifest_handlers/theme_handler.cc',
+ 'common/extensions/manifest_handlers/theme_handler.h',
'common/extensions/manifest_url_handler.cc',
'common/extensions/manifest_url_handler.h',
'common/extensions/message_bundle.cc',
@@ -260,6 +285,8 @@
'common/extensions/permissions/bluetooth_device_permission.h',
'common/extensions/permissions/bluetooth_device_permission_data.cc',
'common/extensions/permissions/bluetooth_device_permission_data.h',
+ 'common/extensions/permissions/chrome_api_permissions.cc',
+ 'common/extensions/permissions/chrome_api_permissions.h',
'common/extensions/permissions/media_galleries_permission.cc',
'common/extensions/permissions/media_galleries_permission.h',
'common/extensions/permissions/media_galleries_permission_data.cc',
@@ -279,8 +306,6 @@
'common/extensions/permissions/usb_device_permission.h',
'common/extensions/permissions/usb_device_permission_data.cc',
'common/extensions/permissions/usb_device_permission_data.h',
- 'common/extensions/request_media_access_permission_helper.cc',
- 'common/extensions/request_media_access_permission_helper.h',
'common/extensions/unpacker.cc',
'common/extensions/unpacker.h',
'common/extensions/update_manifest.cc',
@@ -342,8 +367,9 @@
'common/nacl_messages.h',
'common/nacl_types.cc',
'common/nacl_types.h',
- 'common/omaha_query_params.cc',
- 'common/omaha_query_params.h',
+ 'common/omaha_query_params/omaha_query_params.cc',
+ 'common/omaha_query_params/omaha_query_params.h',
+ 'common/omnibox_focus_state.h',
'common/one_click_signin_messages.h',
'common/pepper_flash.cc',
'common/pepper_flash.h',
@@ -383,22 +409,18 @@
'common/thumbnail_score.h',
'common/time_format.cc',
'common/time_format.h',
+ 'common/tts_messages.h',
+ 'common/tts_utterance_request.cc',
+ 'common/tts_utterance_request.h',
'common/url_constants.cc',
'common/url_constants.h',
- 'common/view_type.cc',
- 'common/view_type.h',
+ 'common/validation_message_messages.h',
'common/web_apps.cc',
'common/web_apps.h',
'common/web_resource/web_resource_unpacker.cc',
'common/web_resource/web_resource_unpacker.h',
'common/worker_thread_ticker.cc',
'common/worker_thread_ticker.h',
- 'common/zip.cc', # Requires zlib directly.
- 'common/zip.h',
- 'common/zip_internal.cc',
- 'common/zip_internal.h',
- 'common/zip_reader.cc',
- 'common/zip_reader.h',
],
'conditions': [
['enable_extensions==1', {
@@ -416,20 +438,18 @@
['include', 'common/extensions/api/extension_action/action_info.h'],
['include', 'common/extensions/api/extension_action/browser_action_handler.cc'],
['include', 'common/extensions/api/extension_action/browser_action_handler.h'],
- ['include', 'common/extensions/api/content_scripts/content_scripts_handler.cc'],
- ['include', 'common/extensions/api/content_scripts/content_scripts_handler.h'],
['include', 'common/extensions/api/extension_action/page_action_handler.cc'],
['include', 'common/extensions/api/extension_action/page_action_handler.h'],
- ['include', 'common/extensions/api/icons/icons_handler.cc'],
- ['include', 'common/extensions/api/icons/icons_handler.h'],
['include', 'common/extensions/api/i18n/default_locale_handler.cc'],
['include', 'common/extensions/api/i18n/default_locale_handler.h'],
['include', 'common/extensions/api/identity/oauth2_manifest_handler.cc'],
['include', 'common/extensions/api/identity/oauth2_manifest_handler.h'],
['include', 'common/extensions/api/plugins/plugins_handler.cc'],
['include', 'common/extensions/api/plugins/plugins_handler.h'],
- ['include', 'common/extensions/api/themes/theme_handler.cc'],
- ['include', 'common/extensions/api/themes/theme_handler.h'],
+ ['include', 'common/extensions/api/spellcheck/spellcheck_handler.cc',],
+ ['include', 'common/extensions/api/spellcheck/spellcheck_handler.h',],
+ ['include', 'common/extensions/api/managed_mode_private/managed_mode_handler.cc'],
+ ['include', 'common/extensions/api/managed_mode_private/managed_mode_handler.h'],
],
}],
['OS != "ios"', {
@@ -461,6 +481,7 @@
['exclude', '^common/profiling\\.'],
['exclude', '^common/service_process_util_'],
['exclude', '^common/spellcheck_'],
+ ['exclude', '^common/validation_message_'],
['exclude', '^common/web_apps\\.'],
# TODO(ios): Include files here as they are made to work; once
# everything is online, remove everything below here and just
@@ -471,6 +492,9 @@
['include', '^common/chrome_version_info\\.cc$'],
['include', '^common/zip'],
],
+ 'include_dirs': [
+ '<(DEPTH)/breakpad/src',
+ ],
}],
['OS=="android"', {
'sources/': [
@@ -521,6 +545,7 @@
'../third_party/mach_override/mach_override.gyp:mach_override',
],
'include_dirs': [
+ '<(DEPTH)/breakpad/src',
'../third_party/GTM',
],
'sources!': [