blimp/engine/browser/blimp_engine_session.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: blimp/engine/browser/blimp_engine_session.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: blimp/engine/browser/blimp_engine_session.cc

diff --git a/blimp/engine/browser/blimp_engine_session.cc b/blimp/engine/browser/blimp_engine_session.cc

index 7e5b91a63f5a41d4fe1aec3acbab419cdbb8b302..97af6a1c2caeabab1ea91ecaf17e37c00c2cc1e8 100644

--- a/blimp/engine/browser/blimp_engine_session.cc

+++ b/blimp/engine/browser/blimp_engine_session.cc

@@ -183,8 +183,8 @@ BlimpEngineSession::~BlimpEngineSession() {

}

void BlimpEngineSession::Initialize() {

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

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

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

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

#if defined(USE_X11)

window_tree_host_.reset(aura::WindowTreeHost::Create(