diff options
Diffstat (limited to 'ash/extended_desktop_unittest.cc')
| -rw-r--r-- | ash/extended_desktop_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc index 31dbd15..f0719d0 100644 --- a/ash/extended_desktop_unittest.cc +++ b/ash/extended_desktop_unittest.cc @@ -222,7 +222,7 @@ TEST_F(ExtendedDesktopTest, SystemModal) { views::Widget* widget_on_1st = CreateTestWidget(gfx::Rect(10, 10, 100, 100)); EXPECT_TRUE(wm::IsActiveWindow(widget_on_1st->GetNativeView())); EXPECT_EQ(root_windows[0], widget_on_1st->GetNativeView()->GetRootWindow()); - EXPECT_EQ(root_windows[0], Shell::GetActiveRootWindow()); + EXPECT_EQ(root_windows[0], Shell::GetTargetRootWindow()); // Open system modal. Make sure it's on 2nd root window and active. views::Widget* modal_widget = views::Widget::CreateWindowWithContextAndBounds( @@ -232,7 +232,7 @@ TEST_F(ExtendedDesktopTest, SystemModal) { modal_widget->Show(); EXPECT_TRUE(wm::IsActiveWindow(modal_widget->GetNativeView())); EXPECT_EQ(root_windows[1], modal_widget->GetNativeView()->GetRootWindow()); - EXPECT_EQ(root_windows[1], Shell::GetActiveRootWindow()); + EXPECT_EQ(root_windows[1], Shell::GetTargetRootWindow()); aura::test::EventGenerator& event_generator(GetEventGenerator()); @@ -240,14 +240,14 @@ TEST_F(ExtendedDesktopTest, SystemModal) { event_generator.MoveMouseToCenterOf(widget_on_1st->GetNativeView()); event_generator.ClickLeftButton(); EXPECT_TRUE(wm::IsActiveWindow(modal_widget->GetNativeView())); - EXPECT_EQ(root_windows[1], Shell::GetActiveRootWindow()); + EXPECT_EQ(root_windows[1], Shell::GetTargetRootWindow()); // Close system modal and so clicking a widget should work now. modal_widget->Close(); event_generator.MoveMouseToCenterOf(widget_on_1st->GetNativeView()); event_generator.ClickLeftButton(); EXPECT_TRUE(wm::IsActiveWindow(widget_on_1st->GetNativeView())); - EXPECT_EQ(root_windows[0], Shell::GetActiveRootWindow()); + EXPECT_EQ(root_windows[0], Shell::GetTargetRootWindow()); } TEST_F(ExtendedDesktopTest, TestCursor) { |