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 /ui/views/corewm/capture_controller_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 'ui/views/corewm/capture_controller_unittest.cc')
| -rw-r--r-- | ui/views/corewm/capture_controller_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/views/corewm/capture_controller_unittest.cc b/ui/views/corewm/capture_controller_unittest.cc index ffece4a..9a536ae 100644 --- a/ui/views/corewm/capture_controller_unittest.cc +++ b/ui/views/corewm/capture_controller_unittest.cc @@ -7,13 +7,13 @@ #include "base/logging.h" #include "ui/aura/env.h" #include "ui/aura/test/aura_test_base.h" -#include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_screen.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/events/event.h" #include "ui/events/event_utils.h" +#include "ui/events/test/event_generator.h" #include "ui/views/test/views_test_base.h" #include "ui/views/view.h" #include "ui/views/widget/root_view.h" @@ -137,7 +137,7 @@ TEST_F(CaptureControllerTest, ResetOtherWindowCaptureOnCapture) { TEST_F(CaptureControllerTest, TouchTargetResetOnCaptureChange) { // Create a window inside the WindowEventDispatcher. scoped_ptr<aura::Window> w1(CreateNormalWindow(1, root_window(), NULL)); - aura::test::EventGenerator event_generator1(root_window()); + ui::test::EventGenerator event_generator1(root_window()); event_generator1.PressTouch(); w1->SetCapture(); // Both capture clients should return the same capture window. |