diff options
author | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 12:34:13 +0000 |
---|---|---|
committer | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 12:34:13 +0000 |
commit | b89622c6a71c0244d753ac9d87171a99805fab64 (patch) | |
tree | 55c1c9a4be4576e784026daa1113b8cabba222bb /ash/accelerators/magnifier_key_scroller_unittest.cc | |
parent | eb7c76762cfe5bd310de84468924dcd97a8ec2d5 (diff) | |
download | chromium_src-b89622c6a71c0244d753ac9d87171a99805fab64.zip chromium_src-b89622c6a71c0244d753ac9d87171a99805fab64.tar.gz chromium_src-b89622c6a71c0244d753ac9d87171a99805fab64.tar.bz2 |
Cleanups for aura/test/event_generator.h (resolve TODOs)
Some purely mechanical changes left over from r283694, now that
aura::test::EventGenerator has moved to ui::test in src/ui/events.
Moves aura/test/event_generator.* to event_generator_delegate_aura.*
Removes `using ui::test::EventGenerator;` declaration and redirects
includes that don't extend the delegate to include the ui/test
event_generator.h directly
BUG=378134
Review URL: https://codereview.chromium.org/406413004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285209 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/magnifier_key_scroller_unittest.cc')
-rw-r--r-- | ash/accelerators/magnifier_key_scroller_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/accelerators/magnifier_key_scroller_unittest.cc b/ash/accelerators/magnifier_key_scroller_unittest.cc index 21eb2ab..e9c6abe 100644 --- a/ash/accelerators/magnifier_key_scroller_unittest.cc +++ b/ash/accelerators/magnifier_key_scroller_unittest.cc @@ -8,8 +8,8 @@ #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/wm/window_util.h" -#include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" +#include "ui/events/test/event_generator.h" namespace ash { namespace { @@ -52,7 +52,7 @@ TEST_F(MagnifierKeyScrollerTest, Basic) { controller->SetEnabled(true); EXPECT_EQ("200,150", controller->GetWindowPosition().ToString()); - aura::test::EventGenerator& generator = GetEventGenerator(); + ui::test::EventGenerator& generator = GetEventGenerator(); // Click and Release generates the press event upon release. generator.PressKey(ui::VKEY_DOWN, ui::EF_SHIFT_DOWN); |