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 /athena/input | |
| 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 'athena/input')
| -rw-r--r-- | athena/input/accelerator_manager_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/athena/input/accelerator_manager_unittest.cc b/athena/input/accelerator_manager_unittest.cc index 4f4c753..cd74ee1 100644 --- a/athena/input/accelerator_manager_unittest.cc +++ b/athena/input/accelerator_manager_unittest.cc @@ -6,7 +6,7 @@ #include "athena/input/public/input_manager.h" #include "athena/test/athena_test_base.h" -#include "ui/aura/test/event_generator.h" +#include "ui/events/test/event_generator.h" namespace athena { namespace { @@ -71,7 +71,7 @@ TEST_F(InputManagerTest, Basic) { accelerator_manager->RegisterAccelerators( data, arraysize(data), &test_handler); - aura::test::EventGenerator generator(root_window()); + ui::test::EventGenerator generator(root_window()); generator.PressKey(ui::VKEY_A, ui::EF_NONE); EXPECT_EQ(kInvalidCommandId, test_handler.GetFiredCommandIdAndReset()); |