Merge from Chromium at DEPS revision r205460
This commit was generated by merge_to_master.py.
Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 1cdfab2..29f10ca 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -32,7 +32,6 @@
'<(DEPTH)/base/base.gyp:base_i18n',
'<(DEPTH)/base/base.gyp:base_prefs',
'<(DEPTH)/base/base.gyp:base_static',
- '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
'<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
'<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
'<(DEPTH)/chrome/chrome_resources.gyp:theme_resources',
@@ -48,9 +47,11 @@
'<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
'<(DEPTH)/third_party/zlib/zlib.gyp:zip',
'<(DEPTH)/ui/ui.gyp:ui_resources',
- '<(DEPTH)/webkit/support/webkit_support.gyp:user_agent',
+ '<(DEPTH)/url/url.gyp:url_lib',
+ '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
],
'sources': [
+ '../apps/app_shim/app_shim_launch.h',
'../apps/app_shim/app_shim_messages.h',
'../extensions/common/constants.cc',
'../extensions/common/constants.h',
@@ -207,6 +208,7 @@
'common/extensions/csp_handler.h',
'common/extensions/csp_validator.cc',
'common/extensions/csp_validator.h',
+ 'common/extensions/dom_action_types.h',
'common/extensions/extension.cc',
'common/extensions/extension.h',
'common/extensions/extension_constants.cc',
@@ -254,6 +256,8 @@
'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/app_launch_info.cc',
+ 'common/extensions/manifest_handlers/app_launch_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',
@@ -262,6 +266,8 @@
'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/nacl_modules_handler.cc',
+ 'common/extensions/manifest_handlers/nacl_modules_handler.h',
'common/extensions/manifest_handlers/offline_enabled_info.cc',
'common/extensions/manifest_handlers/offline_enabled_info.h',
'common/extensions/manifest_handlers/requirements_handler.cc',
@@ -309,6 +315,8 @@
'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/sync_helper.cc',
+ 'common/extensions/sync_helper.h',
'common/extensions/unpacker.cc',
'common/extensions/unpacker.h',
'common/extensions/update_manifest.cc',
@@ -330,8 +338,6 @@
'common/json_schema/json_schema_constants.h',
'common/json_schema/json_schema_validator.cc',
'common/json_schema/json_schema_validator.h',
- 'common/language_detection_details.cc',
- 'common/language_detection_details.h',
'common/localized_error.cc',
'common/localized_error.h',
'common/logging_chrome.cc',
@@ -348,6 +354,7 @@
'common/mac/objc_method_swizzle.mm',
'common/mac/objc_zombie.h',
'common/mac/objc_zombie.mm',
+ 'common/media/webrtc_logging_messages.h',
'common/metrics/entropy_provider.cc',
'common/metrics/entropy_provider.h',
'common/metrics/metrics_log_base.cc',
@@ -376,6 +383,8 @@
'common/omaha_query_params/omaha_query_params.h',
'common/omnibox_focus_state.h',
'common/one_click_signin_messages.h',
+ 'common/partial_circular_buffer.cc',
+ 'common/partial_circular_buffer.h',
'common/pepper_flash.cc',
'common/pepper_flash.h',
'common/pref_names_util.cc',
@@ -415,6 +424,11 @@
'common/thumbnail_score.h',
'common/time_format.cc',
'common/time_format.h',
+ 'common/translate/language_detection_details.cc',
+ 'common/translate/language_detection_details.h',
+ 'common/translate/translate_errors.h',
+ 'common/translate/translate_util.cc',
+ 'common/translate/translate_util.h',
'common/tts_messages.h',
'common/tts_utterance_request.cc',
'common/tts_utterance_request.h',
@@ -434,7 +448,7 @@
'common/extensions/api/extension_api_stub.cc',
],
'dependencies': [
- '../device/device.gyp:device_usb',
+ '../device/usb/usb.gyp:device_usb',
],
}, { # enable_extensions == 0
'sources/': [
@@ -569,6 +583,11 @@
'<(DEPTH)/base/third_party/nspr/nspr.gyp:nspr',
],
}],
+ ['enable_webrtc==0', {
+ 'sources!': [
+ 'common/media/webrtc_logging_messages.h',
+ ]
+ }],
],
'target_conditions': [
['OS == "ios"', {