content/shell/shell_stacking_client_ash.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_stacking_client_ash.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_stacking_client_ash.cc

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

index 5e3fc8afa1125f4c633bcbca599841f871bbad4b..5d70697d7b5e73c647c59172219d9c37e976e52f 100644

--- a/content/shell/shell_stacking_client_ash.cc

+++ b/content/shell/shell_stacking_client_ash.cc

@@ -14,7 +14,6 @@

namespace content {

ShellStackingClientAsh::ShellStackingClientAsh() {

- aura::client::SetStackingClient(this);

}

ShellStackingClientAsh::~ShellStackingClientAsh() {

@@ -25,6 +24,7 @@ ShellStackingClientAsh::~ShellStackingClientAsh() {

}

aura::Window* ShellStackingClientAsh::GetDefaultParent(

+ aura::Window* context,

aura::Window* window,

const gfx::Rect& bounds) {

if (!root_window_.get()) {

« no previous file with comments | « content/shell/shell_stacking_client_ash.h ('k') | ui/aura/client/stacking_client.h » ('j') | no next file with comments »