Merge from Chromium at DEPS revision r210036
This commit was generated by merge_to_master.py.
Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 7856327..2082620 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -36,7 +36,6 @@
'<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
'<(DEPTH)/chrome/chrome_resources.gyp:theme_resources',
'<(DEPTH)/chrome/common_constants.gyp:common_constants',
- '<(DEPTH)/components/components.gyp:breakpad_common',
'<(DEPTH)/components/components.gyp:visitedlink_common',
'<(DEPTH)/content/content.gyp:content_common',
'<(DEPTH)/net/net.gyp:net',
@@ -220,8 +219,6 @@
'common/extensions/extension_icon_set.h',
'common/extensions/extension_l10n_util.cc',
'common/extensions/extension_l10n_util.h',
- 'common/extensions/extension_localization_peer.cc',
- 'common/extensions/extension_localization_peer.h',
'common/extensions/extension_manifest_constants.cc',
'common/extensions/extension_manifest_constants.h',
'common/extensions/extension_messages.cc',
@@ -289,10 +286,10 @@
'common/extensions/permissions/api_permission.h',
'common/extensions/permissions/api_permission_set.cc',
'common/extensions/permissions/api_permission_set.h',
- 'common/extensions/permissions/bluetooth_device_permission.cc',
- '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/bluetooth_permission.cc',
+ 'common/extensions/permissions/bluetooth_permission.h',
+ 'common/extensions/permissions/bluetooth_permission_data.cc',
+ 'common/extensions/permissions/bluetooth_permission_data.h',
'common/extensions/permissions/chrome_api_permissions.cc',
'common/extensions/permissions/chrome_api_permissions.h',
'common/extensions/permissions/media_galleries_permission.cc',
@@ -328,10 +325,21 @@
'common/extensions/value_counter.h',
'common/extensions/web_accessible_resources_handler.cc',
'common/extensions/web_accessible_resources_handler.h',
- 'common/external_ipc_fuzzer.h',
'common/external_ipc_fuzzer.cc',
+ 'common/external_ipc_fuzzer.h',
'common/icon_with_badge_image_source.cc',
'common/icon_with_badge_image_source.h',
+ 'common/importer/imported_bookmark_entry.cc',
+ 'common/importer/imported_bookmark_entry.h',
+ 'common/importer/imported_favicon_usage.cc',
+ 'common/importer/imported_favicon_usage.h',
+ 'common/importer/importer_data_types.cc',
+ 'common/importer/importer_data_types.h',
+ 'common/importer/importer_type.h',
+ 'common/importer/importer_url_row.cc',
+ 'common/importer/importer_url_row.h',
+ 'common/importer/profile_import_process_messages.cc',
+ 'common/importer/profile_import_process_messages.h',
'common/instant_restricted_id_cache.h',
'common/instant_types.cc',
'common/instant_types.h',
@@ -476,6 +484,17 @@
['include', 'common/extensions/api/managed_mode_private/managed_mode_handler.h'],
],
}],
+ ['OS=="win" or OS=="mac"', {
+ 'sources': [
+ 'common/itunes_library.cc',
+ 'common/itunes_library.h',
+ 'common/itunes_xml_utils.cc',
+ 'common/itunes_xml_utils.h',
+ 'common/media_galleries/picasa_types.cc',
+ 'common/media_galleries/picasa_types.h',
+ 'common/media_galleries/pmp_constants.h',
+ ],
+ }],
['OS != "ios"', {
'dependencies': [
'<(DEPTH)/chrome/app/policy/cloud_policy_codegen.gyp:policy',