summaryrefslogtreecommitdiffstats
path: root/ui/ui_unittests.gypi
diff options
context:
space:
mode:
authorbeng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-03 20:46:51 +0000
committerbeng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-03 20:46:51 +0000
commit2c51dbe6f490dd907389581b360b4f84c8621283 (patch)
tree243b8c9e41991286ca77a00c054e7df72573fe31 /ui/ui_unittests.gypi
parent1c7abf7a02fe79fdd77fc09e8b7c658f449ed6f7 (diff)
downloadchromium_src-2c51dbe6f490dd907389581b360b4f84c8621283.zip
chromium_src-2c51dbe6f490dd907389581b360b4f84c8621283.tar.gz
chromium_src-2c51dbe6f490dd907389581b360b4f84c8621283.tar.bz2
Copy aura::Event into ui::Event.
http://crbug.com/125937 TEST=existing Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=149888 Review URL: https://chromiumcodereview.appspot.com/10831137 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui_unittests.gypi')
-rw-r--r--ui/ui_unittests.gypi15
1 files changed, 10 insertions, 5 deletions
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index 7535fb1..4c9c09d 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -67,6 +67,7 @@
'base/cocoa/events_mac_unittest.mm',
'base/cocoa/focus_tracker_unittest.mm',
'base/dialogs/select_file_dialog_win_unittest.cc',
+ 'base/event_unittest.cc',
'base/gtk/gtk_expanded_container_unittest.cc',
'base/gtk/gtk_im_context_util_unittest.cc',
'base/gtk/menu_label_accelerator_util_unittest.cc',
@@ -207,6 +208,15 @@
'base/view_prop_unittest.cc',
],
}],
+ ['use_aura==1 or toolkit_views==1', {
+ 'sources': [
+ 'base/gestures/velocity_calculator_unittest.cc',
+ ],
+ }, {
+ 'sources!': [
+ 'base/event_unittest.cc',
+ ],
+ }],
['use_aura==1', {
'sources!': [
'base/dialogs/select_file_dialog_win_unittest.cc',
@@ -215,11 +225,6 @@
'gfx/screen_unittest.cc',
],
}],
- ['use_aura==1 or toolkit_views==1', {
- 'sources': [
- 'base/gestures/velocity_calculator_unittest.cc',
- ],
- }],
],
},
],