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/display/display_manager_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/display/display_manager_unittest.cc')
| -rw-r--r-- | ash/display/display_manager_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc index 54dd0aa..55ccd03 100644 --- a/ash/display/display_manager_unittest.cc +++ b/ash/display/display_manager_unittest.cc @@ -15,11 +15,11 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "ui/aura/env.h" -#include "ui/aura/test/event_generator.h" #include "ui/aura/window_observer.h" #include "ui/aura/window_tree_host.h" -#include "ui/gfx/display_observer.h" +#include "ui/events/test/event_generator.h" #include "ui/gfx/display.h" +#include "ui/gfx/display_observer.h" #include "ui/gfx/screen.h" #include "ui/gfx/screen_type_delegate.h" @@ -613,7 +613,7 @@ TEST_F(DisplayManagerTest, MAYBE_EnsurePointerInDisplays) { aura::Env* env = aura::Env::GetInstance(); - aura::test::EventGenerator generator(root_windows[0]); + ui::test::EventGenerator generator(root_windows[0]); // Set the initial position. generator.MoveMouseToInHost(350, 150); @@ -1019,8 +1019,8 @@ TEST_F(DisplayManagerTest, MAYBE_UpdateMouseCursorAfterRotateZoom) { aura::Window::Windows root_windows = Shell::GetAllRootWindows(); aura::Env* env = aura::Env::GetInstance(); - aura::test::EventGenerator generator1(root_windows[0]); - aura::test::EventGenerator generator2(root_windows[1]); + ui::test::EventGenerator generator1(root_windows[0]); + ui::test::EventGenerator generator2(root_windows[1]); // Test on 1st display. generator1.MoveMouseToInHost(150, 50); |