content/shell/shell_aura.cc - Issue 11364053: make StackingClient dispatch to either ash or desktop

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: content/shell/shell_aura.cc

Issue 11364053: make StackingClient dispatch to either ash or desktop (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase + disable prerender tests on win-aura Created 8 years, 1 month 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: content/shell/shell_aura.cc

diff --git a/content/shell/shell_aura.cc b/content/shell/shell_aura.cc

index fa5891485419cbdc17ab42601b30003c57f95c23..16157b55f3af6104c01637f68c7aa4759f30364a 100644

--- a/content/shell/shell_aura.cc

+++ b/content/shell/shell_aura.cc

@@ -290,6 +290,7 @@ void Shell::PlatformInitialize() {

gfx::SCREEN_TYPE_NATIVE, new ash::ScreenAsh);

#else

stacking_client_ = new aura::DesktopStackingClient();

+ aura::client::SetStackingClient(stacking_client_);

gfx::Screen::SetScreenInstance(

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

#endif