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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/window_properties.cc ('k') | chrome/test/base/chrome_test_launcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi (revision 176470)
+++ chrome/chrome_tests.gypi (working copy)
@@ -168,6 +168,7 @@
],
'defines': [
'HAS_OUT_OF_PROC_TEST_RUNNER',
+ 'INTERACTIVE_TESTS',
],
'sources': [
'browser/browser_keyevents_browsertest.cc',
@@ -234,6 +235,18 @@
'test/base/view_event_test_base.cc',
'test/base/view_event_test_base.h',
'test/ppapi/ppapi_interactive_browsertest.cc',
+ # TODO(jam): move these files to chrome/test/base
+ '../ash/ui_controls_ash.cc',
+ '../ui/aura/ui_controls_aura.h',
+ '../ui/aura/ui_controls_win.cc',
+ '../ui/aura/ui_controls_x11.cc',
+ '../ui/ui_controls/ui_controls.h',
+ '../ui/ui_controls/ui_controls_aura.cc',
+ '../ui/ui_controls/ui_controls_gtk.cc',
+ '../ui/ui_controls/ui_controls_internal_win.cc',
+ '../ui/ui_controls/ui_controls_internal_win.h',
+ '../ui/ui_controls/ui_controls_mac.mm',
+ '../ui/ui_controls/ui_controls_win.cc',
],
'conditions': [
['toolkit_uses_gtk == 1', {
@@ -315,6 +328,7 @@
['use_aura==1', {
'sources!': [
'browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc',
+ '../ui/ui_controls/ui_controls_win.cc',
],
}],
['chromeos==1', {
« 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