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

Unified Diff: ash/dip_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/desktop_background/desktop_background_view.cc ('k') | ash/display/cursor_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/dip_unittest.cc
diff --git a/ash/dip_unittest.cc b/ash/dip_unittest.cc
index a922da4200f2a29ce96aea4d504664dc919b5cc5..fc0066ab58ca2d79823097049fe6f8f2457485f2 100644
--- a/ash/dip_unittest.cc
+++ b/ash/dip_unittest.cc
@@ -37,7 +37,7 @@ TEST_F(DIPTest, WorkArea) {
aura::Window* root = Shell::GetPrimaryRootWindow();
const gfx::Display display =
- Shell::GetScreen()->GetDisplayNearestWindow(root);
+ gfx::Screen::GetScreen()->GetDisplayNearestWindow(root);
EXPECT_EQ("0,0 1000x900", display.bounds().ToString());
gfx::Rect work_area = display.work_area();
@@ -45,7 +45,7 @@ TEST_F(DIPTest, WorkArea) {
EXPECT_EQ("0,0,47,0", display.bounds().InsetsFrom(work_area).ToString());
UpdateDisplay("2000x1800*2.0f");
- gfx::Screen* screen = Shell::GetScreen();
+ gfx::Screen* screen = gfx::Screen::GetScreen();
const gfx::Display display_2x = screen->GetDisplayNearestWindow(root);
const DisplayInfo display_info_2x =
« no previous file with comments | « ash/desktop_background/desktop_background_view.cc ('k') | ash/display/cursor_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698