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/system/tray | |
| 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/system/tray')
| -rw-r--r-- | ash/system/tray/system_tray_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ash/system/tray/system_tray_unittest.cc b/ash/system/tray/system_tray_unittest.cc index 74c7c02..c798e78 100644 --- a/ash/system/tray/system_tray_unittest.cc +++ b/ash/system/tray/system_tray_unittest.cc @@ -18,10 +18,10 @@ #include "ash/wm/window_util.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" +#include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" #include "ui/base/ui_base_types.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" -#include "ui/events/test/event_generator.h" #include "ui/gfx/geometry/rect.h" #include "ui/views/controls/label.h" #include "ui/views/layout/fill_layout.h" @@ -417,8 +417,8 @@ TEST_F(SystemTrayTest, PersistentBubble) { tray->ShowDefaultView(BUBBLE_CREATE_NEW); ASSERT_TRUE(tray->HasSystemBubble()); { - ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), - gfx::Point(5, 5)); + aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), + gfx::Point(5, 5)); generator.ClickLeftButton(); ASSERT_FALSE(tray->HasSystemBubble()); } @@ -431,8 +431,8 @@ TEST_F(SystemTrayTest, PersistentBubble) { ASSERT_TRUE(tray->HasSystemBubble()); { - ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), - gfx::Point(5, 5)); + aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), + gfx::Point(5, 5)); generator.ClickLeftButton(); ASSERT_TRUE(tray->HasSystemBubble()); } |