diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-21 16:35:51 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-21 16:35:51 +0000 |
| commit | 7a8cbb36ad58fe2c443d6be3a55e387bc95f8592 (patch) | |
| tree | 92df494b3193a09b72d92334e6121a80d1791abb /ash/tooltips/tooltip_controller_unittest.cc | |
| parent | 7de8404f117520baf2d45cf248c5450fecbb051f (diff) | |
| download | chromium_src-7a8cbb36ad58fe2c443d6be3a55e387bc95f8592.zip chromium_src-7a8cbb36ad58fe2c443d6be3a55e387bc95f8592.tar.gz chromium_src-7a8cbb36ad58fe2c443d6be3a55e387bc95f8592.tar.bz2 | |
Change EventGenerator to take a RootWindow at construction instead of just assuming one via RootWindow::GetInstance().
http://crbug.com/112131
TEST=none
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=122716
Review URL: https://chromiumcodereview.appspot.com/9421016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122829 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/tooltips/tooltip_controller_unittest.cc')
| -rw-r--r-- | ash/tooltips/tooltip_controller_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc index ff27e43..badae3c 100644 --- a/ash/tooltips/tooltip_controller_unittest.cc +++ b/ash/tooltips/tooltip_controller_unittest.cc @@ -112,7 +112,7 @@ TEST_F(TooltipControllerTest, ViewTooltip) { view->set_tooltip_text(ASCIIToUTF16("Tooltip Text")); EXPECT_EQ(ASCIIToUTF16(""), GetTooltipText()); EXPECT_EQ(NULL, GetTooltipWindow()); - aura::test::EventGenerator generator; + aura::test::EventGenerator generator(Shell::GetRootWindow()); generator.MoveMouseToCenterOf(widget->GetNativeView()); aura::Window* window = widget->GetNativeView(); @@ -149,7 +149,7 @@ TEST_F(TooltipControllerTest, TooltipsInMultipleViews) { aura::Window* window = widget->GetNativeView(); // Fire tooltip timer so tooltip becomes visible. - aura::test::EventGenerator generator; + aura::test::EventGenerator generator(Shell::GetRootWindow()); generator.MoveMouseRelativeTo(window, view1->bounds().CenterPoint()); FireTooltipTimer(); @@ -186,7 +186,7 @@ TEST_F(TooltipControllerTest, EnableOrDisableTooltips) { EXPECT_EQ(ASCIIToUTF16(""), GetTooltipText()); EXPECT_EQ(NULL, GetTooltipWindow()); - aura::test::EventGenerator generator; + aura::test::EventGenerator generator(Shell::GetRootWindow()); generator.MoveMouseRelativeTo(widget->GetNativeView(), view->bounds().CenterPoint()); string16 expected_tooltip = ASCIIToUTF16("Tooltip Text"); |