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

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: don't guard ash_strings with aura=1 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
« no previous file with comments | « chrome/chrome_resources.gyp ('k') | tools/gritsettings/resource_ids » ('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 (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 2123 matching lines...) Expand 10 before | Expand all | Expand 10 after
2134 ['enable_extensions==0', { 2134 ['enable_extensions==0', {
2135 'sources/': [ 2135 'sources/': [
2136 ['exclude', '^browser/extensions/api/'], 2136 ['exclude', '^browser/extensions/api/'],
2137 ['exclude', '^browser/sync/glue/chrome_extensions_activity_monitor_u nittest.cc'], 2137 ['exclude', '^browser/sync/glue/chrome_extensions_activity_monitor_u nittest.cc'],
2138 ], 2138 ],
2139 }], 2139 }],
2140 ['use_ash==1', { 2140 ['use_ash==1', {
2141 'sources': [ 2141 'sources': [
2142 'browser/ui/app_list/apps_model_builder_unittest.cc', 2142 'browser/ui/app_list/apps_model_builder_unittest.cc',
2143 ], 2143 ],
2144 'dependencies': [
2145 '../ash/ash.gyp:ash_resources',
2146 ],
2144 }], 2147 }],
2145 ['use_aura==1', { 2148 ['use_aura==1', {
2146 'dependencies': [ 2149 'dependencies': [
2147 '../ui/aura/aura.gyp:test_support_aura', 2150 '../ui/aura/aura.gyp:test_support_aura',
2148 ], 2151 ],
2149 'sources/': [ 2152 'sources/': [
2150 ['exclude', '^browser/automation/automation_provider_unittest.cc'], 2153 ['exclude', '^browser/automation/automation_provider_unittest.cc'],
2151 ['exclude', '^browser/accessibility/browser_accessibility_win_unitte st.cc'], 2154 ['exclude', '^browser/accessibility/browser_accessibility_win_unitte st.cc'],
2152 ['exclude', '^browser/ui/views/extensions/browser_action_drag_data_u nittest.cc'], 2155 ['exclude', '^browser/ui/views/extensions/browser_action_drag_data_u nittest.cc'],
2153 ['exclude', '^browser/ui/views/bookmarks/bookmark_editor_view_unitte st.cc'], 2156 ['exclude', '^browser/ui/views/bookmarks/bookmark_editor_view_unitte st.cc'],
(...skipping 2608 matching lines...) Expand 10 before | Expand all | Expand 10 after
4762 '--result', '<@(_outputs)', 4765 '--result', '<@(_outputs)',
4763 '--isolate', 'browser_tests.isolate', 4766 '--isolate', 'browser_tests.isolate',
4764 ], 4767 ],
4765 }, 4768 },
4766 ], 4769 ],
4767 }, 4770 },
4768 ], 4771 ],
4769 }], 4772 }],
4770 ], # 'conditions' 4773 ], # 'conditions'
4771 } 4774 }
OLDNEW
« no previous file with comments | « chrome/chrome_resources.gyp ('k') | tools/gritsettings/resource_ids » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698