summaryrefslogtreecommitdiffstats
path: root/ui/wm
diff options
context:
space:
mode:
authortdanderson@google.com <tdanderson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-20 21:54:21 +0000
committertdanderson@google.com <tdanderson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-20 21:54:21 +0000
commitcd9f71df4ed962591fe006f0f1aae7b14418872d (patch)
tree92ec7f6915e18263a9c1c155ab10d7471dae380c /ui/wm
parent0cbc29bd2b89d1cfd81ef075860e8383c62a4bf4 (diff)
downloadchromium_src-cd9f71df4ed962591fe006f0f1aae7b14418872d.zip
chromium_src-cd9f71df4ed962591fe006f0f1aae7b14418872d.tar.gz
chromium_src-cd9f71df4ed962591fe006f0f1aae7b14418872d.tar.bz2
Move TestEventHandler to ui/events/test
TestEventHandler is not aura-specific, so move it from ui/aura/test to ui/events/test. BUG=354564 R=sadrul@chromium.org, sky@chromium.org Review URL: https://codereview.chromium.org/206593004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258425 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/wm')
-rw-r--r--ui/wm/core/input_method_event_filter_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/wm/core/input_method_event_filter_unittest.cc b/ui/wm/core/input_method_event_filter_unittest.cc
index e5a35e8..71dbcce 100644
--- a/ui/wm/core/input_method_event_filter_unittest.cc
+++ b/ui/wm/core/input_method_event_filter_unittest.cc
@@ -9,9 +9,9 @@
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/test/aura_test_base.h"
#include "ui/aura/test/event_generator.h"
-#include "ui/aura/test/test_event_handler.h"
#include "ui/aura/test/test_windows.h"
#include "ui/aura/window_event_dispatcher.h"
+#include "ui/events/test/test_event_handler.h"
#include "ui/wm/core/compound_event_filter.h"
#if !defined(OS_WIN) && !defined(USE_X11)
@@ -54,7 +54,7 @@ TEST_F(InputMethodEventFilterTest, TestInputMethodKeyEventPropagation) {
root_filter->AddHandler(&input_method_event_filter);
// Add TestEventFilter to the RootWindow.
- aura::test::TestEventHandler test_filter;
+ ui::test::TestEventHandler test_filter;
root_filter->AddHandler(&test_filter);
// We need an active window. Otherwise, the root window will not forward a key