ash/wm/workspace/workspace_event_handler_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/workspace_event_handler_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/multi_window_resize_controller.cc ('k') | ash/wm/workspace/workspace_layout_manager.cc » ('j') | chrome/browser/extensions/display_info_provider_mac.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/wm/workspace/workspace_event_handler_unittest.cc

diff --git a/ash/wm/workspace/workspace_event_handler_unittest.cc b/ash/wm/workspace/workspace_event_handler_unittest.cc

index 5f1e48f1bc407d3d5ed2a3bab5e64ec7fd4ce6a9..2d9ecc372d00905ceafe1344315bd4ef32a336c7 100644

--- a/ash/wm/workspace/workspace_event_handler_unittest.cc

+++ b/ash/wm/workspace/workspace_event_handler_unittest.cc

@@ -106,8 +106,9 @@ TEST_F(WorkspaceEventHandlerTest, DoubleClickSingleAxisResizeEdge) {

wm::ActivateWindow(window.get());

- gfx::Rect work_area = Shell::GetScreen()->GetDisplayNearestWindow(

- window.get()).work_area();

+ gfx::Rect work_area = gfx::Screen::GetScreen()

+ ->GetDisplayNearestWindow(window.get())

+ .work_area();

ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),

window.get());

@@ -212,8 +213,9 @@ TEST_F(WorkspaceEventHandlerTest, DoubleClickSingleAxisWhenSideSnapped) {

aura::test::TestWindowDelegate delegate;

scoped_ptr<aura::Window> window(CreateTestWindow(&delegate, restored_bounds));

- gfx::Rect work_area_in_screen = Shell::GetScreen()->GetDisplayNearestWindow(

- window.get()).work_area();

+ gfx::Rect work_area_in_screen = gfx::Screen::GetScreen()

+ ->GetDisplayNearestWindow(window.get())

+ .work_area();

wm::WindowState* window_state = wm::GetWindowState(window.get());

const wm::WMEvent snap_event(wm::WM_EVENT_SNAP_LEFT);

@@ -253,8 +255,9 @@ TEST_F(WorkspaceEventHandlerTest,

wm::ActivateWindow(window.get());

- gfx::Rect work_area = Shell::GetScreen()->GetDisplayNearestWindow(

- window.get()).work_area();

+ gfx::Rect work_area = gfx::Screen::GetScreen()

+ ->GetDisplayNearestWindow(window.get())

+ .work_area();

delegate.set_maximum_size(gfx::Size(0, 100));

@@ -277,8 +280,9 @@ TEST_F(WorkspaceEventHandlerTest,

wm::ActivateWindow(window.get());

- gfx::Rect work_area = Shell::GetScreen()->GetDisplayNearestWindow(

- window.get()).work_area();

+ gfx::Rect work_area = gfx::Screen::GetScreen()

+ ->GetDisplayNearestWindow(window.get())

+ .work_area();

delegate.set_maximum_size(gfx::Size(100, 0));