summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-29 01:59:51 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-29 01:59:51 +0000
commit033159eb46b9efb112f8f6ea129ca81e2f1c184e (patch)
treee6477d93f66d698fa46f4720ba5e5c08f8d72ce0
parent0c9a8a592a0aa75e2d7ab3a4301cfc98c0e26957 (diff)
downloadchromium_src-033159eb46b9efb112f8f6ea129ca81e2f1c184e.zip
chromium_src-033159eb46b9efb112f8f6ea129ca81e2f1c184e.tar.gz
chromium_src-033159eb46b9efb112f8f6ea129ca81e2f1c184e.tar.bz2
Make sure panel_view_browsertest.cc is only included for toolkit_views in interactive_ui_tests. R=scottmg
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170118 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/chrome_tests.gypi6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 76e1149..a5cfe02 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -207,7 +207,7 @@
'browser/ui/views/keyboard_access_browsertest.cc',
'browser/ui/views/menu_item_view_test.cc',
'browser/ui/views/menu_model_adapter_test.cc',
- #'browser/ui/views/panels/panel_view_browsertest.cc',
+ 'browser/ui/views/panels/panel_view_browsertest.cc',
'browser/ui/views/ssl_client_certificate_selector_browsertest.cc',
'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc',
'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h',
@@ -280,6 +280,10 @@
'../ui/views/views.gyp:views',
'../ui/views/views.gyp:views_test_support',
],
+ }, { # else: toolkit_views == 0
+ 'sources/': [
+ ['exclude', '^browser/ui/views/'],
+ ],
}],
['use_ash==1', {
'dependencies': [