Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: components/components_tests.gyp

Issue 830503004: Data Reduction Proxy blocking page and resources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@interstitalStep1
Patch Set: Add webui_resources.pak Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « components/components_strings.grd ('k') | components/data_reduction_proxy.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 # This turns on e.g. the filename-based detection of which 7 # This turns on e.g. the filename-based detection of which
8 # platforms to include source files on (e.g. files ending in 8 # platforms to include source files on (e.g. files ending in
9 # _mac.h or _mac.cc are only compiled on MacOSX). 9 # _mac.h or _mac.cc are only compiled on MacOSX).
10 'chromium_code': 1, 10 'chromium_code': 1,
(...skipping 11 matching lines...) Expand all
22 'components_strings.gyp:components_strings', 22 'components_strings.gyp:components_strings',
23 ], 23 ],
24 'actions': [ 24 'actions': [
25 { 25 {
26 'action_name': 'repack_components_tests_pak', 26 'action_name': 'repack_components_tests_pak',
27 'variables': { 27 'variables': {
28 'pak_inputs': [ 28 'pak_inputs': [
29 '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pa k', 29 '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pa k',
30 '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_stri ngs_en-US.pak', 30 '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_stri ngs_en-US.pak',
31 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_perc ent.pak', 31 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_perc ent.pak',
32 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
32 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en- US.pak', 33 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en- US.pak',
33 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak', 34 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
34 ], 35 ],
35 'pak_output': '<(PRODUCT_DIR)/components_tests_resources.pak', 36 'pak_output': '<(PRODUCT_DIR)/components_tests_resources.pak',
36 }, 37 },
37 'includes': [ '../build/repack_action.gypi' ], 38 'includes': [ '../build/repack_action.gypi' ],
38 }, 39 },
39 ], 40 ],
40 'direct_dependent_settings': { 41 'direct_dependent_settings': {
41 'mac_bundle_resources': [ 42 'mac_bundle_resources': [
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 621 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
621 '$(SDKROOT)/System/Library/Frameworks/ImageCaptureCore.framewo rk', 622 '$(SDKROOT)/System/Library/Frameworks/ImageCaptureCore.framewo rk',
622 ], 623 ],
623 }, 624 },
624 'sources!': [ 625 'sources!': [
625 'password_manager/core/browser/password_store_default_unittest.c c', 626 'password_manager/core/browser/password_store_default_unittest.c c',
626 ], 627 ],
627 }], 628 }],
628 ['OS == "android"', { 629 ['OS == "android"', {
629 'sources': [ 630 'sources': [
631 'data_reduction_proxy/content/browser/data_reduction_proxy_debug _blocking_page_unittest.cc',
630 'data_reduction_proxy/content/browser/data_reduction_proxy_debug _resource_throttle_unittest.cc', 632 'data_reduction_proxy/content/browser/data_reduction_proxy_debug _resource_throttle_unittest.cc',
631 'data_reduction_proxy/content/browser/data_reduction_proxy_debug _ui_manager_unittest.cc', 633 'data_reduction_proxy/content/browser/data_reduction_proxy_debug _ui_manager_unittest.cc',
632 'invalidation/invalidation_service_android_unittest.cc', 634 'invalidation/invalidation_service_android_unittest.cc',
633 ], 635 ],
634 'sources!': [ 636 'sources!': [
635 'gcm_driver/gcm_account_mapper_unittest.cc', 637 'gcm_driver/gcm_account_mapper_unittest.cc',
636 'gcm_driver/gcm_channel_status_request_unittest.cc', 638 'gcm_driver/gcm_channel_status_request_unittest.cc',
637 'gcm_driver/gcm_client_impl_unittest.cc', 639 'gcm_driver/gcm_client_impl_unittest.cc',
638 'gcm_driver/gcm_delayed_task_controller_unittest.cc', 640 'gcm_driver/gcm_delayed_task_controller_unittest.cc',
639 'gcm_driver/gcm_driver_desktop_unittest.cc', 641 'gcm_driver/gcm_driver_desktop_unittest.cc',
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
1059 '../build/isolate.gypi', 1061 '../build/isolate.gypi',
1060 ], 1062 ],
1061 'sources': [ 1063 'sources': [
1062 'components_unittests.isolate', 1064 'components_unittests.isolate',
1063 ], 1065 ],
1064 }, 1066 },
1065 ], 1067 ],
1066 }], 1068 }],
1067 ], 1069 ],
1068 } 1070 }
OLDNEW
« no previous file with comments | « components/components_strings.grd ('k') | components/data_reduction_proxy.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698