chromecast/browser/cast_content_window.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: chromecast/browser/cast_content_window.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: chromecast/browser/cast_content_window.cc

diff --git a/chromecast/browser/cast_content_window.cc b/chromecast/browser/cast_content_window.cc

index 99f0a779f2b399642104baa88f2c1d2ff3994d4d..a5f63ea1e4248fbb1b3646941ba70a06186f0853 100644

--- a/chromecast/browser/cast_content_window.cc

+++ b/chromecast/browser/cast_content_window.cc

@@ -75,8 +75,8 @@ void CastContentWindow::CreateWindowTree(

// Aura initialization

CastScreen* cast_screen =

shell::CastBrowserProcess::GetInstance()->cast_screen();

- if (!gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_NATIVE))

- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, cast_screen);

+ if (!gfx::Screen::GetScreen())

+ gfx::Screen::SetScreenInstance(cast_screen);

if (cast_screen->GetPrimaryDisplay().size() != initial_size)

cast_screen->UpdateDisplaySize(initial_size);

media::VideoPlaneController::GetInstance()->SetGraphicsPlaneResolution(