diff options
| author | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 13:18:41 +0000 |
|---|---|---|
| committer | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 13:18:41 +0000 |
| commit | dd131d3723dee3050b746319e437514d8fdb6bb1 (patch) | |
| tree | c44435187d6d4df51dcf5e02b31be151de270390 /ui/keyboard | |
| parent | 2c6e3b04ca361d052f1e8fdc70983bcc7c379dba (diff) | |
| download | chromium_src-dd131d3723dee3050b746319e437514d8fdb6bb1.zip chromium_src-dd131d3723dee3050b746319e437514d8fdb6bb1.tar.gz chromium_src-dd131d3723dee3050b746319e437514d8fdb6bb1.tar.bz2 | |
Revert 285209 "Cleanups for aura/test/event_generator.h (resolve..."
> 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
TBR=tapted@chromium.org
Review URL: https://codereview.chromium.org/413983006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285222 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/keyboard')
| -rw-r--r-- | ui/keyboard/keyboard_controller_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/keyboard/keyboard_controller_unittest.cc b/ui/keyboard/keyboard_controller_unittest.cc index 7f97a5f..a39bee8 100644 --- a/ui/keyboard/keyboard_controller_unittest.cc +++ b/ui/keyboard/keyboard_controller_unittest.cc @@ -12,6 +12,7 @@ #include "ui/aura/client/focus_client.h" #include "ui/aura/layout_manager.h" #include "ui/aura/test/aura_test_helper.h" +#include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" @@ -26,7 +27,6 @@ #include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/compositor/test/context_factories_for_test.h" #include "ui/compositor/test/layer_animator_test_controller.h" -#include "ui/events/test/event_generator.h" #include "ui/gfx/geometry/rect.h" #include "ui/keyboard/keyboard_controller_observer.h" #include "ui/keyboard/keyboard_controller_proxy.h" @@ -294,7 +294,7 @@ TEST_F(KeyboardControllerTest, ClickDoesNotFocusKeyboard) { EventObserver observer; keyboard_container->AddPreTargetHandler(&observer); - ui::test::EventGenerator generator(root_window()); + aura::test::EventGenerator generator(root_window()); generator.MoveMouseTo(proxy()->GetKeyboardWindow()->bounds().CenterPoint()); generator.ClickLeftButton(); EXPECT_TRUE(window->HasFocus()); |