Merge from Chromium at DEPS revision r202854
This commit was generated by merge_to_master.py.
Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 4a7bcc0..1cdfab2 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -72,8 +72,8 @@
'../extensions/common/extension_resource.h',
'../extensions/common/id_util.cc',
'../extensions/common/id_util.h',
- '../extensions/common/install_warning.h',
'../extensions/common/install_warning.cc',
+ '../extensions/common/install_warning.h',
'../extensions/common/matcher/regex_set_matcher.cc',
'../extensions/common/matcher/regex_set_matcher.h',
'../extensions/common/matcher/string_pattern.cc',
@@ -88,6 +88,8 @@
'../extensions/common/matcher/url_matcher_factory.h',
'../extensions/common/matcher/url_matcher_helpers.cc',
'../extensions/common/matcher/url_matcher_helpers.h',
+ '../extensions/common/one_shot_event.cc',
+ '../extensions/common/one_shot_event.h',
'../extensions/common/url_pattern.cc',
'../extensions/common/url_pattern.h',
'../extensions/common/url_pattern_set.cc',
@@ -98,10 +100,10 @@
'common/attrition_experiments.h',
'common/auto_start_linux.cc',
'common/auto_start_linux.h',
+ 'common/autocomplete_match_type.cc',
+ 'common/autocomplete_match_type.h',
'common/automation_constants.cc',
'common/automation_constants.h',
- 'common/automation_events.cc',
- 'common/automation_events.h',
'common/automation_id.cc',
'common/automation_id.h',
'common/automation_messages.cc',
@@ -117,6 +119,7 @@
'common/child_process_logging_win.cc',
'common/chrome_content_client.cc',
'common/chrome_content_client.h',
+ 'common/chrome_content_client_constants.cc',
'common/chrome_content_client_ios.mm',
'common/chrome_notification_types.h',
'common/chrome_result_codes.h',
@@ -327,6 +330,8 @@
'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',
@@ -531,11 +536,6 @@
],
},
}],
- ['OS=="linux" and selinux==1', {
- 'dependencies': [
- '../build/linux/system.gyp:selinux',
- ],
- }],
['chromeos==1', {
'sources!': [
'common/chrome_version_info_linux.cc',