Index: chrome/chrome_common.gypi |
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi |
index 7844282307c15fe7a5a18120e2b05c120e78acf5..3e0c727bbc7eb40b079bf6210f788bca2dd0b7c7 100644 |
--- a/chrome/chrome_common.gypi |
+++ b/chrome/chrome_common.gypi |
@@ -51,20 +51,6 @@ |
'common/custom_handlers/protocol_handler.cc', |
'common/custom_handlers/protocol_handler.h', |
'common/descriptors_android.h', |
- 'common/extensions/chrome_extension_messages.h', |
- 'common/extensions/chrome_extensions_client.cc', |
- 'common/extensions/chrome_extensions_client.h', |
- 'common/extensions/chrome_utility_extensions_messages.h', |
- 'common/extensions/extension_constants.cc', |
- 'common/extensions/extension_constants.h', |
- 'common/extensions/features/chrome_channel_feature_filter.cc', |
- 'common/extensions/features/chrome_channel_feature_filter.h', |
- 'common/extensions/features/feature_channel.cc', |
- 'common/extensions/features/feature_channel.h', |
- 'common/extensions/permissions/chrome_api_permissions.cc', |
- 'common/extensions/permissions/chrome_api_permissions.h', |
- 'common/extensions/permissions/chrome_permission_message_provider.cc', |
- 'common/extensions/permissions/chrome_permission_message_provider.h', |
'common/favicon/favicon_url_parser.cc', |
'common/favicon/favicon_url_parser.h', |
'common/icon_with_badge_image_source.cc', |
@@ -172,16 +158,26 @@ |
'common/extensions/api/url_handlers/url_handlers_parser.h', |
'common/extensions/api/webstore/webstore_api_constants.cc', |
'common/extensions/api/webstore/webstore_api_constants.h', |
+ 'common/extensions/chrome_extension_messages.h', |
+ 'common/extensions/chrome_extensions_client.cc', |
+ 'common/extensions/chrome_extensions_client.h', |
'common/extensions/chrome_manifest_handlers.cc', |
'common/extensions/chrome_manifest_handlers.h', |
'common/extensions/chrome_manifest_url_handlers.cc', |
'common/extensions/chrome_manifest_url_handlers.h', |
+ 'common/extensions/chrome_utility_extensions_messages.h', |
'common/extensions/command.cc', |
'common/extensions/command.h', |
+ 'common/extensions/extension_constants.cc', |
+ 'common/extensions/extension_constants.h', |
'common/extensions/extension_file_util.cc', |
'common/extensions/extension_file_util.h', |
'common/extensions/extension_process_policy.cc', |
'common/extensions/extension_process_policy.h', |
+ 'common/extensions/features/chrome_channel_feature_filter.cc', |
+ 'common/extensions/features/chrome_channel_feature_filter.h', |
+ 'common/extensions/features/feature_channel.cc', |
+ 'common/extensions/features/feature_channel.h', |
'common/extensions/image_writer/image_writer_util_mac.cc', |
'common/extensions/image_writer/image_writer_util_mac.h', |
'common/extensions/manifest_handlers/app_isolation_info.cc', |
@@ -204,6 +200,10 @@ |
'common/extensions/manifest_handlers/theme_handler.h', |
'common/extensions/manifest_handlers/ui_overrides_handler.cc', |
'common/extensions/manifest_handlers/ui_overrides_handler.h', |
+ 'common/extensions/permissions/chrome_api_permissions.cc', |
+ 'common/extensions/permissions/chrome_api_permissions.h', |
+ 'common/extensions/permissions/chrome_permission_message_provider.cc', |
+ 'common/extensions/permissions/chrome_permission_message_provider.h', |
'common/extensions/sync_helper.cc', |
'common/extensions/sync_helper.h', |
], |
@@ -311,8 +311,7 @@ |
'<(DEPTH)/components/components.gyp:variations', |
'<(DEPTH)/content/content.gyp:content_common', |
'<(DEPTH)/crypto/crypto.gyp:crypto', |
- '<(DEPTH)/extensions/extensions_resources.gyp:extensions_resources', |
- '<(DEPTH)/extensions/extensions_strings.gyp:extensions_strings', |
+ '<(DEPTH)/extensions/extensions.gyp:extensions_common_constants', |
'<(DEPTH)/media/cast/cast.gyp:cast_net', |
'<(DEPTH)/net/net.gyp:net', |
'<(DEPTH)/skia/skia.gyp:skia', |
@@ -335,6 +334,9 @@ |
'<(DEPTH)/device/usb/usb.gyp:device_usb', |
'<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api', |
'<(DEPTH)/extensions/common/api/api.gyp:extensions_api', |
+ '<(DEPTH)/extensions/extensions.gyp:extensions_common', |
+ '<(DEPTH)/extensions/extensions_resources.gyp:extensions_resources', |
+ '<(DEPTH)/extensions/extensions_strings.gyp:extensions_strings', |
], |
'export_dependent_settings': [ |
'<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api', |
@@ -361,7 +363,6 @@ |
'<(DEPTH)/components/components.gyp:signin_core_common', |
'<(DEPTH)/components/components.gyp:translate_content_common', |
'<(DEPTH)/components/components.gyp:visitedlink_common', |
- '<(DEPTH)/extensions/extensions.gyp:extensions_common', |
'<(DEPTH)/ipc/ipc.gyp:ipc', |
'<(DEPTH)/third_party/re2/re2.gyp:re2', |
'<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', |