extensions/browser/api/system_display/system_display_apitest.cc - Issue 1608733002: Remove ui/gfx/screen_type_delegate.h

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: extensions/browser/api/system_display/system_display_apitest.cc

Issue 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4

Patch Set: and another rebase 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:

Index: extensions/browser/api/system_display/system_display_apitest.cc

diff --git a/extensions/browser/api/system_display/system_display_apitest.cc b/extensions/browser/api/system_display/system_display_apitest.cc

index 1f3974e85b238dd122a75e79f2c06e6de4023432..cdcb519e5e3d28d741f602f398bf98ef40271069 100644

--- a/extensions/browser/api/system_display/system_display_apitest.cc

+++ b/extensions/browser/api/system_display/system_display_apitest.cc

@@ -142,9 +142,8 @@ class SystemDisplayApiTest : public ShellApiTest {

void SetUpOnMainThread() override {

ShellApiTest::SetUpOnMainThread();

- ANNOTATE_LEAKING_OBJECT_PTR(

- gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_NATIVE));

- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());

+ ANNOTATE_LEAKING_OBJECT_PTR(gfx::Screen::GetScreen());

+ gfx::Screen::SetScreenInstance(screen_.get());

DisplayInfoProvider::InitializeForTesting(provider_.get());

}