diff options
| author | tdanderson@google.com <tdanderson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 21:54:21 +0000 |
|---|---|---|
| committer | tdanderson@google.com <tdanderson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 21:54:21 +0000 |
| commit | cd9f71df4ed962591fe006f0f1aae7b14418872d (patch) | |
| tree | 92ec7f6915e18263a9c1c155ab10d7471dae380c /ash/shell_unittest.cc | |
| parent | 0cbc29bd2b89d1cfd81ef075860e8383c62a4bf4 (diff) | |
| download | chromium_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 'ash/shell_unittest.cc')
| -rw-r--r-- | ash/shell_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc index 8b00092..781b32a 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc @@ -26,11 +26,11 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/env.h" #include "ui/aura/test/event_generator.h" -#include "ui/aura/test/test_event_handler.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/base/models/simple_menu_model.h" #include "ui/events/test/events_test_utils.h" +#include "ui/events/test/test_event_handler.h" #include "ui/gfx/size.h" #include "ui/views/controls/menu/menu_controller.h" #include "ui/views/controls/menu/menu_runner.h" @@ -516,7 +516,7 @@ TEST_F(ShellTest, TestPreTargetHandlerOrder) { // Verifies an EventHandler added to Env gets notified from EventGenerator. TEST_F(ShellTest, EnvPreTargetHandler) { - aura::test::TestEventHandler event_handler; + ui::test::TestEventHandler event_handler; aura::Env::GetInstance()->AddPreTargetHandler(&event_handler); aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow()); generator.MoveMouseBy(1, 1); |