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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 11878013: Make ui_controls only usable from interactive_ui_tests. This has two benefits: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 11 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 | « ash/wm/window_properties.cc ('k') | chrome/test/base/chrome_test_launcher.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) 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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 # Runtime dependencies 161 # Runtime dependencies
162 '../ppapi/ppapi_internal.gyp:ppapi_tests', 162 '../ppapi/ppapi_internal.gyp:ppapi_tests',
163 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support', 163 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support',
164 '../webkit/support/webkit_support.gyp:webkit_resources', 164 '../webkit/support/webkit_support.gyp:webkit_resources',
165 ], 165 ],
166 'include_dirs': [ 166 'include_dirs': [
167 '..', 167 '..',
168 ], 168 ],
169 'defines': [ 169 'defines': [
170 'HAS_OUT_OF_PROC_TEST_RUNNER', 170 'HAS_OUT_OF_PROC_TEST_RUNNER',
171 'INTERACTIVE_TESTS',
171 ], 172 ],
172 'sources': [ 173 'sources': [
173 'browser/browser_keyevents_browsertest.cc', 174 'browser/browser_keyevents_browsertest.cc',
174 'browser/extensions/api/tabs/tabs_interactive_test.cc', 175 'browser/extensions/api/tabs/tabs_interactive_test.cc',
175 'browser/extensions/extension_apitest.cc', 176 'browser/extensions/extension_apitest.cc',
176 'browser/extensions/extension_browsertest.cc', 177 'browser/extensions/extension_browsertest.cc',
177 'browser/extensions/extension_crash_recovery_browsertest.cc', 178 'browser/extensions/extension_crash_recovery_browsertest.cc',
178 'browser/extensions/extension_function_test_utils.cc', 179 'browser/extensions/extension_function_test_utils.cc',
179 'browser/extensions/extension_keybinding_apitest.cc', 180 'browser/extensions/extension_keybinding_apitest.cc',
180 'browser/extensions/notifications_apitest.cc', 181 'browser/extensions/notifications_apitest.cc',
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 'test/base/interactive_test_utils.h', 228 'test/base/interactive_test_utils.h',
228 'test/base/interactive_test_utils_aura.cc', 229 'test/base/interactive_test_utils_aura.cc',
229 'test/base/interactive_test_utils_aura.h', 230 'test/base/interactive_test_utils_aura.h',
230 'test/base/interactive_test_utils_gtk.cc', 231 'test/base/interactive_test_utils_gtk.cc',
231 'test/base/interactive_test_utils_mac.mm', 232 'test/base/interactive_test_utils_mac.mm',
232 'test/base/interactive_test_utils_views.cc', 233 'test/base/interactive_test_utils_views.cc',
233 'test/base/interactive_test_utils_win.cc', 234 'test/base/interactive_test_utils_win.cc',
234 'test/base/view_event_test_base.cc', 235 'test/base/view_event_test_base.cc',
235 'test/base/view_event_test_base.h', 236 'test/base/view_event_test_base.h',
236 'test/ppapi/ppapi_interactive_browsertest.cc', 237 'test/ppapi/ppapi_interactive_browsertest.cc',
238 # TODO(jam): move these files to chrome/test/base
239 '../ash/ui_controls_ash.cc',
240 '../ui/aura/ui_controls_aura.h',
241 '../ui/aura/ui_controls_win.cc',
242 '../ui/aura/ui_controls_x11.cc',
243 '../ui/ui_controls/ui_controls.h',
244 '../ui/ui_controls/ui_controls_aura.cc',
245 '../ui/ui_controls/ui_controls_gtk.cc',
246 '../ui/ui_controls/ui_controls_internal_win.cc',
247 '../ui/ui_controls/ui_controls_internal_win.h',
248 '../ui/ui_controls/ui_controls_mac.mm',
249 '../ui/ui_controls/ui_controls_win.cc',
237 ], 250 ],
238 'conditions': [ 251 'conditions': [
239 ['toolkit_uses_gtk == 1', { 252 ['toolkit_uses_gtk == 1', {
240 'dependencies': [ 253 'dependencies': [
241 '../build/linux/system.gyp:gtk', 254 '../build/linux/system.gyp:gtk',
242 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 255 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
243 ], 256 ],
244 'sources!': [ 257 'sources!': [
245 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc', 258 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc',
246 ], 259 ],
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 ], 321 ],
309 }], 322 }],
310 ['use_ash==1', { 323 ['use_ash==1', {
311 'dependencies': [ 324 'dependencies': [
312 '../ash/ash.gyp:ash_test_support', 325 '../ash/ash.gyp:ash_test_support',
313 ], 326 ],
314 }], 327 }],
315 ['use_aura==1', { 328 ['use_aura==1', {
316 'sources!': [ 329 'sources!': [
317 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc ', 330 'browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc ',
331 '../ui/ui_controls/ui_controls_win.cc',
318 ], 332 ],
319 }], 333 }],
320 ['chromeos==1', { 334 ['chromeos==1', {
321 'sources': [ 335 'sources': [
322 'browser/chromeos/cros/cros_in_process_browser_test.cc', 336 'browser/chromeos/cros/cros_in_process_browser_test.cc',
323 'browser/chromeos/cros/cros_in_process_browser_test.h', 337 'browser/chromeos/cros/cros_in_process_browser_test.h',
324 'browser/chromeos/cros/cros_mock.cc', 338 'browser/chromeos/cros/cros_mock.cc',
325 'browser/chromeos/cros/cros_mock.h', 339 'browser/chromeos/cros/cros_mock.h',
326 'browser/chromeos/login/login_browsertest.cc', 340 'browser/chromeos/login/login_browsertest.cc',
327 'browser/chromeos/login/mock_authenticator.cc', 341 'browser/chromeos/login/mock_authenticator.cc',
(...skipping 2537 matching lines...) Expand 10 before | Expand all | Expand 10 after
2865 'sync_integration_tests.isolate', 2879 'sync_integration_tests.isolate',
2866 ], 2880 ],
2867 'sources': [ 2881 'sources': [
2868 'sync_integration_tests.isolate', 2882 'sync_integration_tests.isolate',
2869 ], 2883 ],
2870 }, 2884 },
2871 ], 2885 ],
2872 }], 2886 }],
2873 ], # 'conditions' 2887 ], # 'conditions'
2874 } 2888 }
OLDNEW
« no previous file with comments | « ash/wm/window_properties.cc ('k') | chrome/test/base/chrome_test_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698