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

Unified Diff: chrome/chrome_tests.gypi

Issue 443553003: MacViews: Split ViewEventTestBase into platform-specific files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index cd81368c5354e63bad1800568607b7000319c381..27d16b98bb12b5d58b6ef69e17bd2470cdae5a22 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -147,6 +147,11 @@
'browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc',
'browser/ui/views/toolbar/toolbar_button_test.cc',
'browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc',
+ 'test/base/chrome_views_test_helper.h',
+ 'test/base/chrome_views_test_helper_ash.cc',
+ 'test/base/chrome_views_test_helper_aura.cc',
+ 'test/base/chrome_views_test_helper_chromeos.cc',
+ 'test/base/chrome_views_test_helper_mac.mm',
'test/base/interactive_test_utils.cc',
'test/base/interactive_test_utils.h',
'test/base/interactive_test_utils_aura.cc',
@@ -205,6 +210,10 @@
'../ash/wm/ash_native_cursor_manager_interactive_uitest.cc',
'browser/ui/window_sizer/window_sizer_ash_uitest.cc',
],
+ 'sources!': [
+ # Use only the _ash version when Ash is available.
+ 'test/base/chrome_views_test_helper_aura.cc',
+ ]
}],
['OS=="mac"', {
'sources!': [
@@ -238,6 +247,10 @@
'../ui/views/views.gyp:views_test_support',
],
}, { # else: toolkit_views == 0
+ 'sources!': [
+ 'test/base/view_event_test_base.cc',
+ 'test/base/view_event_test_base.h',
+ ],
'sources/': [
['exclude', '^browser/ui/views/'],
['exclude', '^../ui/views/'],
@@ -310,6 +323,10 @@
'browser/ui/panels/stacked_panel_browsertest.cc',
'browser/ui/views/message_center/web_notification_tray_browsertest.cc',
'browser/ui/views/panels/panel_view_browsertest.cc',
+
+ # Use only the _chromeos version on ChromeOS.
+ 'test/base/chrome_views_test_helper_ash.cc',
+ 'test/base/chrome_views_test_helper_aura.cc',
],
}],
['OS=="win"', {
@@ -1994,6 +2011,11 @@
'browser/ui/webui/constrained_web_dialog_ui_browsertest.cc',
],
}, { # else: toolkit_views == 0
+ 'sources!': [
+ 'test/base/chrome_views_test_helper.h',
+ 'test/base/view_event_test_base.cc',
+ 'test/base/view_event_test_base.h',
+ ],
'sources/': [
['exclude', '^../ui/views/'],
['exclude', '^browser/ui/views/'],
« no previous file with comments | « no previous file | chrome/test/base/chrome_views_test_helper.h » ('j') | chrome/test/base/chrome_views_test_helper.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698