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

Unified Diff: ash/magnifier/magnification_controller_unittest.cc

Issue 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4
Patch Set: and another rebase 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/host/ash_window_tree_host_x11.cc ('k') | ash/shelf/shelf_widget_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/magnifier/magnification_controller_unittest.cc
diff --git a/ash/magnifier/magnification_controller_unittest.cc b/ash/magnifier/magnification_controller_unittest.cc
index 6c5a2d85953087b5099f976ea670669caa8f4047..a18813f8f9a72286e16e333f01507cb20a2f3f69 100644
--- a/ash/magnifier/magnification_controller_unittest.cc
+++ b/ash/magnifier/magnification_controller_unittest.cc
@@ -703,8 +703,7 @@ TEST_F(MagnificationControllerTest, EnableMagnifierInUnifiedDesktop) {
GetMagnificationController()->SetEnabled(true);
- gfx::Screen* screen =
- gfx::Screen::GetScreenFor(Shell::GetPrimaryRootWindow());
+ gfx::Screen* screen = gfx::Screen::GetScreen();
UpdateDisplay("500x500, 500x500");
EXPECT_EQ("0,0 1000x500", screen->GetPrimaryDisplay().bounds().ToString());
« no previous file with comments | « ash/host/ash_window_tree_host_x11.cc ('k') | ash/shelf/shelf_widget_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698