chrome/browser/chromeos/display/display_preferences_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/chromeos/display/display_preferences_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/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc ('k') | chrome/browser/chromeos/input_method/mode_indicator_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/display/display_preferences_unittest.cc

diff --git a/chrome/browser/chromeos/display/display_preferences_unittest.cc b/chrome/browser/chromeos/display/display_preferences_unittest.cc

index 3557ceb3362cf628dcbb39e201645dcfaab90411..c593aa2340e0222f1c708e03c893672a959772f7 100644

--- a/chrome/browser/chromeos/display/display_preferences_unittest.cc

+++ b/chrome/browser/chromeos/display/display_preferences_unittest.cc

@@ -269,7 +269,7 @@ TEST_F(DisplayPreferencesTest, BasicStores) {

id1, dummy_id, ash::DisplayLayout(ash::DisplayLayout::LEFT, 20));

// Can't switch to a display that does not exist.

window_tree_host_manager->SetPrimaryDisplayId(dummy_id);

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

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

window_tree_host_manager->SetOverscanInsets(id1, gfx::Insets(10, 11, 12, 13));

display_manager->SetDisplayRotation(id1, gfx::Display::ROTATE_90,

@@ -474,7 +474,7 @@ TEST_F(DisplayPreferencesTest, PreventStore) {

ResolutionNotificationController::SuppressTimerForTest();

LoggedInAsUser();

UpdateDisplay("400x300#500x400|400x300|300x200");

- int64_t id = ash::Shell::GetScreen()->GetPrimaryDisplay().id();

+ int64_t id = gfx::Screen::GetScreen()->GetPrimaryDisplay().id();

// Set display's resolution in single display. It creates the notification and

// display preferences should not stored meanwhile.

ash::Shell* shell = ash::Shell::GetInstance();

@@ -590,7 +590,7 @@ TEST_F(DisplayPreferencesTest, DontStoreInGuestMode) {

UpdateDisplay("200x200*2,200x200");

LoggedInAsGuest();

- int64_t id1 = ash::Shell::GetScreen()->GetPrimaryDisplay().id();

+ int64_t id1 = gfx::Screen::GetScreen()->GetPrimaryDisplay().id();

ash::test::ScopedSetInternalDisplayId set_internal(id1);

int64_t id2 = ash::ScreenUtil::GetSecondaryDisplay().id();

ash::DisplayManager* display_manager =

@@ -599,7 +599,7 @@ TEST_F(DisplayPreferencesTest, DontStoreInGuestMode) {

display_manager->SetLayoutForCurrentDisplays(layout);

ash::SetDisplayUIScale(id1, 1.25f);

window_tree_host_manager->SetPrimaryDisplayId(id2);

- int64_t new_primary = ash::Shell::GetScreen()->GetPrimaryDisplay().id();

+ int64_t new_primary = gfx::Screen::GetScreen()->GetPrimaryDisplay().id();

window_tree_host_manager->SetOverscanInsets(new_primary,

gfx::Insets(10, 11, 12, 13));

display_manager->SetDisplayRotation(new_primary, gfx::Display::ROTATE_90,