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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: presubmit.py Created 8 years, 3 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 | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'variables' : { 5 'variables' : {
6 'pyautolib_sources': [ 6 'pyautolib_sources': [
7 'app/chrome_command_ids.h', 7 'app/chrome_command_ids.h',
8 'app/chrome_dll_resource.h', 8 'app/chrome_dll_resource.h',
9 'common/automation_constants.h', 9 'common/automation_constants.h',
10 'common/pref_names.cc', 10 'common/pref_names.cc',
(...skipping 2122 matching lines...) Expand 10 before | Expand all | Expand 10 after
2133 ['enable_extensions==0', { 2133 ['enable_extensions==0', {
2134 'sources/': [ 2134 'sources/': [
2135 ['exclude', '^browser/extensions/api/'], 2135 ['exclude', '^browser/extensions/api/'],
2136 ['exclude', '^browser/sync/glue/chrome_extensions_activity_monitor_u nittest.cc'], 2136 ['exclude', '^browser/sync/glue/chrome_extensions_activity_monitor_u nittest.cc'],
2137 ], 2137 ],
2138 }], 2138 }],
2139 ['use_ash==1', { 2139 ['use_ash==1', {
2140 'sources': [ 2140 'sources': [
2141 'browser/ui/app_list/apps_model_builder_unittest.cc', 2141 'browser/ui/app_list/apps_model_builder_unittest.cc',
2142 ], 2142 ],
2143 'dependencies': [
2144 '../ash/ash.gyp:ash_resources',
2145 ],
2143 }], 2146 }],
2144 ['use_aura==1', { 2147 ['use_aura==1', {
2145 'dependencies': [ 2148 'dependencies': [
2146 '../ui/aura/aura.gyp:test_support_aura', 2149 '../ui/aura/aura.gyp:test_support_aura',
2147 ], 2150 ],
2148 'sources/': [ 2151 'sources/': [
2149 ['exclude', '^browser/automation/automation_provider_unittest.cc'], 2152 ['exclude', '^browser/automation/automation_provider_unittest.cc'],
2150 ['exclude', '^browser/accessibility/browser_accessibility_win_unitte st.cc'], 2153 ['exclude', '^browser/accessibility/browser_accessibility_win_unitte st.cc'],
2151 ['exclude', '^browser/ui/views/extensions/browser_action_drag_data_u nittest.cc'], 2154 ['exclude', '^browser/ui/views/extensions/browser_action_drag_data_u nittest.cc'],
2152 ['exclude', '^browser/ui/views/bookmarks/bookmark_editor_view_unitte st.cc'], 2155 ['exclude', '^browser/ui/views/bookmarks/bookmark_editor_view_unitte st.cc'],
(...skipping 2607 matching lines...) Expand 10 before | Expand all | Expand 10 after
4760 '--result', '<@(_outputs)', 4763 '--result', '<@(_outputs)',
4761 '--isolate', 'browser_tests.isolate', 4764 '--isolate', 'browser_tests.isolate',
4762 ], 4765 ],
4763 }, 4766 },
4764 ], 4767 ],
4765 }, 4768 },
4766 ], 4769 ],
4767 }], 4770 }],
4768 ], # 'conditions' 4771 ], # 'conditions'
4769 } 4772 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698