chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.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: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.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 some new gfx::Screen additions 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

« chrome/browser/ui/ash/ash_util.cc ('K') | « chrome/browser/ui/ash/window_positioner_unittest.cc ('k') | chrome/browser/ui/gtk/browser_window_gtk.cc » ('j') | chrome/browser/ui/panels/display_settings_provider.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

diff --git a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

index bc27803de66103c94a8cdf44e6fdab52c1d6229d..69422922e474d89ef6106ab2b974fcd5f2592f63 100644

--- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

+++ b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

@@ -29,7 +29,8 @@ ChromeBrowserMainExtraPartsAura::~ChromeBrowserMainExtraPartsAura() {

void ChromeBrowserMainExtraPartsAura::PreProfileInit() {

#if !defined(USE_ASH)

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

+ gfx::Screen::SetScreenInstance(

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

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

stacking_client_.reset(new aura::DesktopStackingClient);

#endif // !USE_ASH