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

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.h

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

index da8095f4e6f0b90d2a3cce90387678b3755dbd2a..9c45b1f9cb1caf2c0e7234e6ace38db6f6fca3d8 100644

--- a/content/shell/shell_stacking_client_ash.h

+++ b/content/shell/shell_stacking_client_ash.h

@@ -39,7 +39,8 @@ class ShellStackingClientAsh : public aura::client::StackingClient {

virtual ~ShellStackingClientAsh();

// Overridden from client::StackingClient:

- virtual aura::Window* GetDefaultParent(aura::Window* window,

+ virtual aura::Window* GetDefaultParent(aura::Window* context,

+ aura::Window* window,

const gfx::Rect& bounds) OVERRIDE;

private:

« no previous file with comments | « content/shell/shell_aura.cc ('k') | content/shell/shell_stacking_client_ash.cc » ('j') | no next file with comments »