diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-05-14 12:12:37 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-05-14 12:12:37 +0100 |
| commit | 010d83a9304c5a91596085d917d248abff47903a (patch) | |
| tree | 41ef1a01862f352f9653c7a9cfa817abefe2cce2 /chrome/chrome_common.gypi | |
| parent | 08c107de54178bb0990a09adec724924e8bc9486 (diff) | |
| download | chromium_org-010d83a9304c5a91596085d917d248abff47903a.tar.gz | |
Merge from Chromium at DEPS revision 269336
This commit was generated by merge_to_master.py.
Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
Diffstat (limited to 'chrome/chrome_common.gypi')
| -rw-r--r-- | chrome/chrome_common.gypi | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index dbccd6c857..eab0246ddf 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -111,7 +111,6 @@ 'common/custom_handlers/protocol_handler.cc', 'common/custom_handlers/protocol_handler.h', 'common/descriptors_android.h', - 'common/encrypted_media_messages_android.h', 'common/extensions/api/bluetooth/bluetooth_manifest_data.cc', 'common/extensions/api/bluetooth/bluetooth_manifest_data.h', 'common/extensions/api/bluetooth/bluetooth_manifest_handler.cc', @@ -179,10 +178,12 @@ '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/automation.h', + 'common/extensions/manifest_handlers/automation.cc', 'common/extensions/manifest_handlers/content_scripts_handler.cc', 'common/extensions/manifest_handlers/content_scripts_handler.h', - 'common/extensions/manifest_handlers/externally_connectable.cc', - 'common/extensions/manifest_handlers/externally_connectable.h', + 'common/extensions/manifest_handlers/mime_types_handler.cc', + 'common/extensions/manifest_handlers/mime_types_handler.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', @@ -195,8 +196,6 @@ 'common/extensions/manifest_handlers/ui_overrides_handler.h', 'common/extensions/manifest_url_handler.cc', 'common/extensions/manifest_url_handler.h', - 'common/extensions/mime_types_handler.cc', - 'common/extensions/mime_types_handler.h', 'common/extensions/permissions/chrome_api_permissions.cc', 'common/extensions/permissions/chrome_api_permissions.h', 'common/extensions/permissions/chrome_permission_message_provider.cc', @@ -255,10 +254,6 @@ 'common/media/webrtc_logging_message_data.h', 'common/metrics/caching_permuted_entropy_provider.cc', 'common/metrics/caching_permuted_entropy_provider.h', - 'common/metrics/metrics_log_base.cc', - 'common/metrics/metrics_log_base.h', - 'common/metrics/metrics_log_manager.cc', - 'common/metrics/metrics_log_manager.h', 'common/metrics/metrics_service_base.cc', 'common/metrics/metrics_service_base.h', 'common/metrics/variations/experiment_labels.cc', @@ -686,14 +681,7 @@ 'type': 'static_library', 'sources': [ 'common/metrics/proto/chrome_experiments.proto', - 'common/metrics/proto/chrome_user_metrics_extension.proto', - 'common/metrics/proto/histogram_event.proto', - 'common/metrics/proto/omnibox_event.proto', - 'common/metrics/proto/perf_data.proto', 'common/metrics/proto/permuted_entropy_cache.proto', - 'common/metrics/proto/profiler_event.proto', - 'common/metrics/proto/system_profile.proto', - 'common/metrics/proto/user_action_event.proto', ], 'variables': { 'proto_in_dir': 'common/metrics/proto', |