chrome/browser/extensions/display_info_provider_chromeos_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/extensions/display_info_provider_chromeos_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/extensions/display_info_provider_chromeos.cc ('k') | chrome/browser/extensions/display_info_provider_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/display_info_provider_chromeos_unittest.cc

diff --git a/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc b/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc

index c621bdfd9fb595b607288658cc9f70d4b4eba64a..772416736c2487875cb4b7668bbed2ab5a908b83 100644

--- a/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc

+++ b/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc

@@ -770,14 +770,14 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginOnPrimary) {

EXPECT_EQ("1200,0 300x500", secondary.bounds().ToString());

// The operation failed because the primary property would be set before

// setting bounds. The primary display shouldn't have been changed, though.

- EXPECT_NE(ash::Shell::GetScreen()->GetPrimaryDisplay().id(), secondary.id());

+ EXPECT_NE(gfx::Screen::GetScreen()->GetPrimaryDisplay().id(), secondary.id());

}

TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginWithMirroring) {

UpdateDisplay("1200x600,600x1000*2");

const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();

- const gfx::Display& primary = ash::Shell::GetScreen()->GetPrimaryDisplay();

+ const gfx::Display& primary = gfx::Screen::GetScreen()->GetPrimaryDisplay();

api::system_display::DisplayProperties info;

info.bounds_origin_x.reset(new int(300));

@@ -833,7 +833,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetRotation) {

EXPECT_EQ("0,0 300x500", secondary.bounds().ToString());

EXPECT_EQ(gfx::Display::ROTATE_180, secondary.rotation());

- EXPECT_EQ(ash::Shell::GetScreen()->GetPrimaryDisplay().id(), secondary.id());

+ EXPECT_EQ(gfx::Screen::GetScreen()->GetPrimaryDisplay().id(), secondary.id());

info.rotation.reset(new int(0));

CallSetDisplayUnitInfo(

@@ -844,7 +844,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetRotation) {

EXPECT_EQ("0,0 300x500", secondary.bounds().ToString());

EXPECT_EQ(gfx::Display::ROTATE_0, secondary.rotation());

- EXPECT_EQ(ash::Shell::GetScreen()->GetPrimaryDisplay().id(), secondary.id());

+ EXPECT_EQ(gfx::Screen::GetScreen()->GetPrimaryDisplay().id(), secondary.id());

}

// Tests that rotation changes made before entering maximize mode are restored