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 /ash/focus_cycler_unittest.cc | |
| 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 'ash/focus_cycler_unittest.cc')
| -rw-r--r-- | ash/focus_cycler_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc index 74569d3..33c89c2 100644 --- a/ash/focus_cycler_unittest.cc +++ b/ash/focus_cycler_unittest.cc @@ -15,10 +15,10 @@ #include "ash/system/tray/system_tray.h" #include "ash/test/ash_test_base.h" #include "ash/wm/window_util.h" +#include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" -#include "ui/events/test/event_generator.h" #include "ui/views/accessible_pane_view.h" #include "ui/views/controls/button/menu_button.h" #include "ui/views/widget/widget.h" @@ -389,7 +389,7 @@ TEST_F(FocusCyclerTest, CycleFocusThroughWindowWithPanes) { // Pressing "Escape" while on the status area should // deactivate it, and activate the browser window. aura::Window* root = Shell::GetPrimaryRootWindow(); - ui::test::EventGenerator event_generator(root, root); + aura::test::EventGenerator event_generator(root, root); event_generator.PressKey(ui::VKEY_ESCAPE, 0); EXPECT_TRUE(wm::IsActiveWindow(browser_window)); EXPECT_EQ(focus_manager->GetFocusedView(), view1); |