diff options
Diffstat (limited to 'ash/system/tray/system_tray_unittest.cc')
| -rw-r--r-- | ash/system/tray/system_tray_unittest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ash/system/tray/system_tray_unittest.cc b/ash/system/tray/system_tray_unittest.cc index 1c50a43..6577a78 100644 --- a/ash/system/tray/system_tray_unittest.cc +++ b/ash/system/tray/system_tray_unittest.cc @@ -138,12 +138,12 @@ TEST_F(SystemTrayTest, TrayWidgetAutoResizes) { SystemTray* tray = GetSystemTray(); ASSERT_TRUE(tray->GetWidget()); - gfx::Size widget_size = tray->GetWidget()->GetWindowScreenBounds().size(); + gfx::Size widget_size = tray->GetWidget()->GetWindowBoundsInScreen().size(); TestItem* test_item = new TestItem; tray->AddTrayItem(test_item); - gfx::Size new_size = tray->GetWidget()->GetWindowScreenBounds().size(); + gfx::Size new_size = tray->GetWidget()->GetWindowBoundsInScreen().size(); // Adding the new item should change the size of the tray. EXPECT_NE(widget_size.ToString(), new_size.ToString()); @@ -152,11 +152,11 @@ TEST_F(SystemTrayTest, TrayWidgetAutoResizes) { // tray. test_item->tray_view()->SetVisible(false); EXPECT_EQ(widget_size.ToString(), - tray->GetWidget()->GetWindowScreenBounds().size().ToString()); + tray->GetWidget()->GetWindowBoundsInScreen().size().ToString()); test_item->tray_view()->SetVisible(true); EXPECT_EQ(new_size.ToString(), - tray->GetWidget()->GetWindowScreenBounds().size().ToString()); + tray->GetWidget()->GetWindowBoundsInScreen().size().ToString()); } TEST_F(SystemTrayTest, SystemTrayNotifications) { @@ -209,7 +209,7 @@ TEST_F(SystemTrayTest, BubbleCreationTypesTest) { RunAllPendingInMessageLoop(); views::Widget* widget = test_item->default_view()->GetWidget(); - gfx::Rect bubble_bounds = widget->GetWindowScreenBounds(); + gfx::Rect bubble_bounds = widget->GetWindowBoundsInScreen(); tray->ShowDetailedView(test_item, 0, true, BUBBLE_USE_EXISTING); RunAllPendingInMessageLoop(); @@ -217,14 +217,14 @@ TEST_F(SystemTrayTest, BubbleCreationTypesTest) { EXPECT_FALSE(test_item->default_view()); EXPECT_EQ(bubble_bounds.ToString(), test_item->detailed_view()->GetWidget()-> - GetWindowScreenBounds().ToString()); + GetWindowBoundsInScreen().ToString()); EXPECT_EQ(widget, test_item->detailed_view()->GetWidget()); tray->ShowDefaultView(BUBBLE_USE_EXISTING); RunAllPendingInMessageLoop(); EXPECT_EQ(bubble_bounds.ToString(), test_item->default_view()->GetWidget()-> - GetWindowScreenBounds().ToString()); + GetWindowBoundsInScreen().ToString()); EXPECT_EQ(widget, test_item->default_view()->GetWidget()); } |