chrome/browser/signin/signin_error_notifier_ash_unittest.cc - Issue 1920263003: Rename gfx::Display/Screen to display::Display/Screen in chrome

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/signin/signin_error_notifier_ash_unittest.cc

Issue 1920263003: Rename gfx::Display/Screen to display::Display/Screen in chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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/plugins/plugin_power_saver_browsertest.cc ('k') | chrome/browser/sync/sync_error_notifier_ash_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/signin/signin_error_notifier_ash_unittest.cc

diff --git a/chrome/browser/signin/signin_error_notifier_ash_unittest.cc b/chrome/browser/signin/signin_error_notifier_ash_unittest.cc

index 322195a93e8726eb1c8c1041882be869af722442..bd0fada6f5353a063553b7fc1c415a709119612b 100644

--- a/chrome/browser/signin/signin_error_notifier_ash_unittest.cc

+++ b/chrome/browser/signin/signin_error_notifier_ash_unittest.cc

@@ -31,7 +31,7 @@

#if defined(OS_WIN)

#include "chrome/browser/ui/ash/ash_util.h"

#include "ui/aura/test/test_screen.h"

-#include "ui/gfx/screen.h"

+#include "ui/display/screen.h"

#endif

namespace ash {

@@ -67,7 +67,7 @@ class SigninErrorNotifierTest : public AshTestBase {

// Set up screen for Windows.

#if defined(OS_WIN)

test_screen_.reset(aura::TestScreen::Create(gfx::Size()));

- gfx::Screen::SetScreenInstance(test_screen_.get());

+ display::Screen::SetScreenInstance(test_screen_.get());

#endif

error_controller_ = SigninErrorControllerFactory::GetForProfile(

@@ -78,7 +78,7 @@ class SigninErrorNotifierTest : public AshTestBase {

void TearDown() override {

#if defined(OS_WIN)

- gfx::Screen::SetScreenInstance(nullptr);

+ display::Screen::SetScreenInstance(nullptr);

test_screen_.reset();

#endif

profile_manager_.reset();

@@ -97,7 +97,7 @@ class SigninErrorNotifierTest : public AshTestBase {

}

#if defined(OS_WIN)

- std::unique_ptr<gfx::Screen> test_screen_;

+ std::unique_ptr<display::Screen> test_screen_;

#endif

std::unique_ptr<TestingProfileManager> profile_manager_;

std::unique_ptr<TestingProfile> profile_;