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/tooltips | |
| 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/tooltips')
| -rw-r--r-- | ash/tooltips/tooltip_controller_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc index c7834f9..bb01730 100644 --- a/ash/tooltips/tooltip_controller_unittest.cc +++ b/ash/tooltips/tooltip_controller_unittest.cc @@ -6,10 +6,10 @@ #include "ash/test/ash_test_base.h" #include "base/strings/utf_string_conversions.h" #include "ui/aura/env.h" -#include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/events/test/event_generator.h" #include "ui/gfx/font.h" #include "ui/gfx/point.h" #include "ui/views/corewm/tooltip_controller.h" @@ -105,7 +105,7 @@ TEST_F(TooltipControllerTest, HideTooltipWhenCursorHidden) { EXPECT_EQ(base::string16(), helper_->GetTooltipText()); EXPECT_EQ(NULL, helper_->GetTooltipWindow()); - aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow()); + ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow()); generator.MoveMouseRelativeTo(widget->GetNativeView(), view->bounds().CenterPoint()); base::string16 expected_tooltip = base::ASCIIToUTF16("Tooltip Text"); @@ -148,7 +148,7 @@ TEST_F(TooltipControllerTest, TooltipsOnMultiDisplayShouldNotCrash) { EXPECT_EQ(widget2->GetNativeView()->GetRootWindow(), root_windows[1]); // Show tooltip on second display. - aura::test::EventGenerator generator(root_windows[1]); + ui::test::EventGenerator generator(root_windows[1]); generator.MoveMouseRelativeTo(widget2->GetNativeView(), view2->bounds().CenterPoint()); helper_->FireTooltipTimer(); @@ -167,7 +167,7 @@ TEST_F(TooltipControllerTest, TooltipsOnMultiDisplayShouldNotCrash) { // The tooltip should create a new aura window for itself, so we should still // be able to show tooltips on the primary display. - aura::test::EventGenerator generator1(root_windows[0]); + ui::test::EventGenerator generator1(root_windows[0]); generator1.MoveMouseRelativeTo(widget1->GetNativeView(), view1->bounds().CenterPoint()); helper_->FireTooltipTimer(); |