diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-03 20:56:38 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-03 20:56:38 +0000 |
| commit | 04ebc6df487121e122409de6f93c2819c4c0a320 (patch) | |
| tree | 3773045e36287d31d63b76ab877e4e2dc54284f3 /ui/ui_unittests.gypi | |
| parent | 359cd9313d441b52b29fd6ba1abdb1db84fc3df3 (diff) | |
| download | chromium_src-04ebc6df487121e122409de6f93c2819c4c0a320.zip chromium_src-04ebc6df487121e122409de6f93c2819c4c0a320.tar.gz chromium_src-04ebc6df487121e122409de6f93c2819c4c0a320.tar.bz2 | |
Revert 149916 - 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
TBR=beng@google.com
Review URL: https://chromiumcodereview.appspot.com/10827162
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149921 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui_unittests.gypi')
| -rw-r--r-- | ui/ui_unittests.gypi | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi index 4c9c09d..7535fb1 100644 --- a/ui/ui_unittests.gypi +++ b/ui/ui_unittests.gypi @@ -67,7 +67,6 @@ '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', @@ -208,15 +207,6 @@ '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', @@ -225,6 +215,11 @@ 'gfx/screen_unittest.cc', ], }], + ['use_aura==1 or toolkit_views==1', { + 'sources': [ + 'base/gestures/velocity_calculator_unittest.cc', + ], + }], ], }, ], |