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 /ash/shell_unittest.cc | |
| 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 '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 5d3faf6..aafb8cd 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc @@ -25,10 +25,10 @@ #include "base/strings/utf_string_conversions.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/env.h" -#include "ui/aura/test/event_generator.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/event_generator.h" #include "ui/events/test/events_test_utils.h" #include "ui/events/test/test_event_handler.h" #include "ui/gfx/size.h" @@ -509,7 +509,7 @@ TEST_F(ShellTest, TestPreTargetHandlerOrder) { TEST_F(ShellTest, EnvPreTargetHandler) { ui::test::TestEventHandler event_handler; aura::Env::GetInstance()->AddPreTargetHandler(&event_handler); - aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow()); + ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow()); generator.MoveMouseBy(1, 1); EXPECT_NE(0, event_handler.num_mouse_events()); aura::Env::GetInstance()->RemovePreTargetHandler(&event_handler); |