diff options
| author | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-28 01:48:52 +0000 |
|---|---|---|
| committer | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-28 01:48:52 +0000 |
| commit | 73c9fd0c41a31aab0be7a31e173f3a90f7b588f7 (patch) | |
| tree | 0becd035d0e5424fc115a5e84d3b86cf218fe648 /athena/input | |
| parent | eab395117ab90f0a26b2c0335c3619e459973fe6 (diff) | |
| download | chromium_src-73c9fd0c41a31aab0be7a31e173f3a90f7b588f7.zip chromium_src-73c9fd0c41a31aab0be7a31e173f3a90f7b588f7.tar.gz chromium_src-73c9fd0c41a31aab0be7a31e173f3a90f7b588f7.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
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=285209
Review URL: https://codereview.chromium.org/406413004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285857 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()); |