chrome/browser/ui/ash/window_positioner_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: chrome/browser/ui/ash/window_positioner_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 | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc ('k') | chrome/browser/ui/webui/options/chromeos/display_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/window_positioner_unittest.cc

diff --git a/chrome/browser/ui/ash/window_positioner_unittest.cc b/chrome/browser/ui/ash/window_positioner_unittest.cc

index b36dd53bd20603d3c4cbb54cbc197a21d3d9de74..0ec615fc2bc865892d0ff72655e7071b1bd7e412 100644

--- a/chrome/browser/ui/ash/window_positioner_unittest.cc

+++ b/chrome/browser/ui/ash/window_positioner_unittest.cc

@@ -6,7 +6,6 @@

#include <utility>

-#include "ash/shell.h"

#include "ash/test/ash_test_base.h"

#include "ash/test/test_shell_delegate.h"

#include "ash/wm/window_resizer.h"

@@ -104,7 +103,7 @@ int AlignToGridRoundDown(int location, int grid_size) {

TEST_F(WindowPositionerTest, cascading) {

const gfx::Rect work_area =

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

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

// First see that the window will cascade down when there is no space.

window()->SetBounds(work_area);

@@ -165,7 +164,7 @@ TEST_F(WindowPositionerTest, cascading) {

TEST_F(WindowPositionerTest, filling) {

const gfx::Rect work_area =

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

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

gfx::Rect popup_position(0, 0, 256, 128);

// Leave space on the left and the right and see if we fill top to bottom.

window()->SetBounds(gfx::Rect(work_area.x() + popup_position.width(),

@@ -220,7 +219,7 @@ TEST_F(WindowPositionerTest, filling) {

TEST_F(WindowPositionerTest, biggerThenBorder) {

const gfx::Rect work_area =

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

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

gfx::Rect pop_position(0, 0, work_area.width(), work_area.height());