chromecast/browser/cast_browser_main_parts.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_browser_main_parts.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_browser_main_parts.cc

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

index 48671a46eba17cb2475695a8bfb6c82e38b6336d..92e3a48da796c22c47519a4cbed3bbd7a11b9856 100644

--- a/chromecast/browser/cast_browser_main_parts.cc

+++ b/chromecast/browser/cast_browser_main_parts.cc

@@ -326,9 +326,8 @@ int CastBrowserMainParts::PreCreateThreads() {

// code. See CastContentWindow::CreateWindowTree for update when resolution

// is available.

cast_browser_process_->SetCastScreen(make_scoped_ptr(new CastScreen));

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

- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE,

- cast_browser_process_->cast_screen());

+ DCHECK(!gfx::Screen::GetScreen());

+ gfx::Screen::SetScreenInstance(cast_browser_process_->cast_screen());

#endif

content::ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme(