Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(645)

Unified Diff: ash/system/web_notification/web_notification_tray_unittest.cc

Issue 1608053002: Remove now-unnecessary wrappers around gfx::Screen::GetScreen() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-5
Patch Set: cros Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/web_notification/web_notification_tray.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/web_notification/web_notification_tray_unittest.cc
diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc
index 946e3ce22f5803d41f0724f0cc230925d53b8486..55cd0acbb2e7b30dec6fa812a80fc1ebd1fddf93 100644
--- a/ash/system/web_notification/web_notification_tray_unittest.cc
+++ b/ash/system/web_notification/web_notification_tray_unittest.cc
@@ -436,7 +436,7 @@ TEST_F(WebNotificationTrayTest, MAYBE_PopupAndFullscreen) {
// Move the mouse cursor at the bottom, which shows the shelf.
ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
gfx::Point bottom_right =
- Shell::GetScreen()->GetPrimaryDisplay().bounds().bottom_right();
+ gfx::Screen::GetScreen()->GetPrimaryDisplay().bounds().bottom_right();
bottom_right.Offset(-1, -1);
generator.MoveMouseTo(bottom_right);
shelf->UpdateAutoHideStateNow();
@@ -444,7 +444,7 @@ TEST_F(WebNotificationTrayTest, MAYBE_PopupAndFullscreen) {
EXPECT_EQ(bottom, GetPopupWorkAreaBottom());
generator.MoveMouseTo(
- Shell::GetScreen()->GetPrimaryDisplay().bounds().CenterPoint());
+ gfx::Screen::GetScreen()->GetPrimaryDisplay().bounds().CenterPoint());
shelf->UpdateAutoHideStateNow();
EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
EXPECT_EQ(bottom_auto_hidden, GetPopupWorkAreaBottom());
« no previous file with comments | « ash/system/web_notification/web_notification_tray.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698