ash/wm/workspace_controller_unittest.cc - Issue 1608053002: Remove now-unnecessary wrappers around gfx::Screen::GetScreen()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/wm/workspace_controller_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: . 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

« ash/wm/window_state_unittest.cc ('K') | « ash/wm/workspace/workspace_window_resizer.cc ('k') | chrome/browser/extensions/display_info_provider_aura.h » ('j') | chrome/browser/extensions/display_info_provider_mac.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/wm/workspace_controller_unittest.cc

diff --git a/ash/wm/workspace_controller_unittest.cc b/ash/wm/workspace_controller_unittest.cc

index 3739158577a6a31a7d5e5282f277b6136d93cacf..2b884eb066539eb2219e0cc537d8402b7ff454ca 100644

--- a/ash/wm/workspace_controller_unittest.cc

+++ b/ash/wm/workspace_controller_unittest.cc

@@ -139,7 +139,7 @@ class WorkspaceControllerTest : public test::AshTestBase {

}

gfx::Rect GetFullscreenBounds(aura::Window* window) {

- return Shell::GetScreen()->GetDisplayNearestWindow(window).bounds();

+ return gfx::Screen::GetScreen()->GetDisplayNearestWindow(window).bounds();

}

ShelfWidget* shelf_widget() {

@@ -626,7 +626,7 @@ TEST_F(WorkspaceControllerTest, MoveOnSwitch) {

// Increase the size of the WorkAreaInsets. This would make |w1| fall

// completely out of the display work area.

gfx::Insets insets =

- Shell::GetScreen()->GetPrimaryDisplay().GetWorkAreaInsets();

+ gfx::Screen::GetScreen()->GetPrimaryDisplay().GetWorkAreaInsets();

insets.Set(0, 0, insets.bottom() + 30, 0);

Shell::GetInstance()->SetDisplayWorkAreaInsets(w1.get(), insets);