ui/views/examples/content_client/examples_browser_main_parts.cc - Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash

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: ui/views/examples/content_client/examples_browser_main_parts.cc

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix new addition Created 8 years, 2 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

Index: ui/views/examples/content_client/examples_browser_main_parts.cc

diff --git a/ui/views/examples/content_client/examples_browser_main_parts.cc b/ui/views/examples/content_client/examples_browser_main_parts.cc

index a21c9c162efc7a84f019689c83c77ef2841e4b70..3c0b2603daf803cfbec5c05b44c13da0957f6025 100644

--- a/ui/views/examples/content_client/examples_browser_main_parts.cc

+++ b/ui/views/examples/content_client/examples_browser_main_parts.cc

@@ -58,7 +58,8 @@ void ExamplesBrowserMainParts::PreMainMessageLoopRun() {

#if defined(USE_AURA)

aura::Env::GetInstance()->SetDisplayManager(new aura::SingleDisplayManager);

stacking_client_.reset(new aura::DesktopStackingClient);

- gfx::Screen::SetInstance(aura::CreateDesktopScreen());

+ gfx::Screen::SetScreenInstance(

+ gfx::SCREEN_TYPE_NATIVE, aura::CreateDesktopScreen());

#endif

views_delegate_.reset(new ExamplesViewsDelegate);

« no previous file with comments | « ui/views/drag_utils.cc ('k') | ui/views/mouse_watcher.cc » ('j') | no next file with comments »