Merge from Chromium at DEPS revision r213057
This commit was generated by merge_to_master.py.
Change-Id: I3e2e2506eb9b0080157e9c5f133559df3e600388
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 169d04a..5444c5d 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -91,10 +91,14 @@
'../extensions/common/matcher/url_matcher_helpers.h',
'../extensions/common/one_shot_event.cc',
'../extensions/common/one_shot_event.h',
+ '../extensions/common/switches.cc',
+ '../extensions/common/switches.h',
'../extensions/common/url_pattern.cc',
'../extensions/common/url_pattern.h',
'../extensions/common/url_pattern_set.cc',
'../extensions/common/url_pattern_set.h',
+ '../extensions/common/user_script.cc',
+ '../extensions/common/user_script.h',
'../extensions/common/view_type.cc',
'../extensions/common/view_type.h',
'common/all_messages.h',
@@ -123,7 +127,6 @@
'common/chrome_content_client_constants.cc',
'common/chrome_content_client_ios.mm',
'common/chrome_result_codes.h',
- 'common/chrome_sandbox_type_mac.h',
'common/chrome_utility_messages.h',
'common/chrome_version_info.cc',
'common/chrome_version_info_android.cc',
@@ -145,6 +148,7 @@
'common/common_param_traits.cc',
'common/common_param_traits.h',
'common/common_param_traits_macros.h',
+ 'common/content_restriction.h',
'common/content_settings.cc',
'common/content_settings.h',
'common/content_settings_helper.cc',
@@ -190,8 +194,6 @@
'common/extensions/api/media_galleries_private/media_galleries_handler.cc',
'common/extensions/api/omnibox/omnibox_handler.cc',
'common/extensions/api/omnibox/omnibox_handler.h',
- 'common/extensions/api/page_launcher/page_launcher_handler.cc',
- 'common/extensions/api/page_launcher/page_launcher_handler.h',
'common/extensions/api/plugins/plugins_handler.cc',
'common/extensions/api/plugins/plugins_handler.h',
'common/extensions/api/speech/tts_engine_manifest_handler.cc',
@@ -268,6 +270,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/minimum_chrome_version_checker.cc',
+ 'common/extensions/manifest_handlers/minimum_chrome_version_checker.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',
@@ -323,8 +327,6 @@
'common/extensions/sync_helper.h',
'common/extensions/update_manifest.cc',
'common/extensions/update_manifest.h',
- 'common/extensions/user_script.cc',
- 'common/extensions/user_script.h',
'common/extensions/value_counter.cc',
'common/extensions/value_counter.h',
'common/extensions/web_accessible_resources_handler.cc',
@@ -403,8 +405,6 @@
'common/multi_process_lock_linux.cc',
'common/multi_process_lock_mac.cc',
'common/multi_process_lock_win.cc',
- 'common/nacl_cmd_line.cc',
- 'common/nacl_cmd_line.h',
'common/nacl_host_messages.h',
'common/nacl_messages.cc',
'common/nacl_messages.h',
@@ -481,6 +481,7 @@
'common/worker_thread_ticker.cc',
'common/worker_thread_ticker.h',
'../components/nacl/common/nacl_process_type.h',
+ '../components/nacl/common/nacl_sandbox_type_mac.h',
],
'conditions': [
['enable_extensions==1', {
@@ -488,6 +489,7 @@
'common/extensions/api/extension_api_stub.cc',
],
'dependencies': [
+ '../device/bluetooth/bluetooth.gyp:device_bluetooth',
'../device/usb/usb.gyp:device_usb',
],
}, { # enable_extensions == 0
@@ -530,6 +532,7 @@
'<(DEPTH)/chrome/app/policy/cloud_policy_codegen.gyp:policy',
'<(DEPTH)/chrome/common/extensions/api/api.gyp:api',
'<(DEPTH)/components/components.gyp:autofill_core_common',
+ '<(DEPTH)/components/nacl_common.gyp:nacl_common',
'<(DEPTH)/ipc/ipc.gyp:ipc',
'<(DEPTH)/printing/printing.gyp:printing',
'<(DEPTH)/third_party/adobe/flash/flash_player.gyp:flapper_version_h',
@@ -590,6 +593,7 @@
}],
['enable_mdns == 1', {
'sources': [
+ 'common/local_discovery/local_discovery_messages.h',
'common/local_discovery/service_discovery_client.cc',
'common/local_discovery/service_discovery_client.h',
]