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

Side by Side Diff: ui/aura_shell/aura_shell.gyp

Issue 8805033: Makes tests either use mock compositor or mock WebGraphicsContext3D (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Incorporate review feedback and tweaks for win_aura Created 9 years 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 | « ui/aura/test/test_suite.cc ('k') | ui/aura_shell/test_suite.cc » ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 9
10 'targets': [ 10 'targets': [
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 '../../base/base.gyp:test_support_base', 128 '../../base/base.gyp:test_support_base',
129 '../../chrome/chrome_resources.gyp:packed_resources', 129 '../../chrome/chrome_resources.gyp:packed_resources',
130 '../../build/temp_gyp/googleurl.gyp:googleurl', 130 '../../build/temp_gyp/googleurl.gyp:googleurl',
131 '../../skia/skia.gyp:skia', 131 '../../skia/skia.gyp:skia',
132 '../../testing/gtest.gyp:gtest', 132 '../../testing/gtest.gyp:gtest',
133 '../../third_party/icu/icu.gyp:icui18n', 133 '../../third_party/icu/icu.gyp:icui18n',
134 '../../third_party/icu/icu.gyp:icuuc', 134 '../../third_party/icu/icu.gyp:icuuc',
135 '../aura/aura.gyp:aura', 135 '../aura/aura.gyp:aura',
136 '../aura/aura.gyp:test_support_aura', 136 '../aura/aura.gyp:test_support_aura',
137 '../gfx/compositor/compositor.gyp:compositor_test_support', 137 '../gfx/compositor/compositor.gyp:compositor_test_support',
138 '../gfx/compositor/compositor.gyp:test_compositor',
139 '../ui.gyp:gfx_resources', 138 '../ui.gyp:gfx_resources',
140 '../ui.gyp:ui', 139 '../ui.gyp:ui',
141 '../ui.gyp:ui_resources', 140 '../ui.gyp:ui_resources',
142 '../ui.gyp:ui_resources_standard', 141 '../ui.gyp:ui_resources_standard',
143 '../views/views.gyp:views', 142 '../views/views.gyp:views',
144 'aura_shell', 143 'aura_shell',
145 ], 144 ],
146 'sources': [ 145 'sources': [
147 'default_container_layout_manager_unittest.cc', 146 'default_container_layout_manager_unittest.cc',
148 'root_window_event_filter_unittest.cc', 147 'root_window_event_filter_unittest.cc',
(...skipping 14 matching lines...) Expand all
163 'test/aura_shell_test_base.h', 162 'test/aura_shell_test_base.h',
164 'toplevel_layout_manager_unittest.cc', 163 'toplevel_layout_manager_unittest.cc',
165 'toplevel_window_event_filter_unittest.cc', 164 'toplevel_window_event_filter_unittest.cc',
166 'workspace_controller_unittest.cc', 165 'workspace_controller_unittest.cc',
167 'workspace/workspace_manager_unittest.cc', 166 'workspace/workspace_manager_unittest.cc',
168 167
169 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 168 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
170 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 169 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
171 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc', 170 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc',
172 ], 171 ],
172 'conditions': [
173 ['use_webkit_compositor==1', {
174 'dependencies': [
175 '../gfx/compositor/compositor.gyp:compositor',
176 ],
177 }, { # use_webkit_compositor!=1
178 'dependencies': [
179 '../gfx/compositor/compositor.gyp:test_compositor',
180 ],
181 }],
182 ],
173 }, 183 },
174 { 184 {
175 'target_name': 'aura_shell_exe', 185 'target_name': 'aura_shell_exe',
176 'type': 'executable', 186 'type': 'executable',
177 'dependencies': [ 187 'dependencies': [
178 '../../base/base.gyp:base', 188 '../../base/base.gyp:base',
179 '../../base/base.gyp:base_i18n', 189 '../../base/base.gyp:base_i18n',
180 '../../chrome/chrome_resources.gyp:packed_resources', 190 '../../chrome/chrome_resources.gyp:packed_resources',
181 '../../skia/skia.gyp:skia', 191 '../../skia/skia.gyp:skia',
182 '../../third_party/icu/icu.gyp:icui18n', 192 '../../third_party/icu/icu.gyp:icui18n',
(...skipping 19 matching lines...) Expand all
202 'examples/widgets.cc', 212 'examples/widgets.cc',
203 'examples/window_type_launcher.cc', 213 'examples/window_type_launcher.cc',
204 'examples/window_type_launcher.h', 214 'examples/window_type_launcher.h',
205 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 215 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
206 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 216 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
207 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc', 217 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc',
208 ], 218 ],
209 }, 219 },
210 ], 220 ],
211 } 221 }
OLDNEW
« no previous file with comments | « ui/aura/test/test_suite.cc ('k') | ui/aura_shell/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698