ui/aura/demo/demo_main.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: ui/aura/demo/demo_main.cc

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

Patch Set: remove file 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: ui/aura/demo/demo_main.cc

diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc

index 451affb5070e8c313631db4d6ba23c625eb5544b..46dbe727fda248b3c3eb15cf3407de9629d5417e 100644

--- a/ui/aura/demo/demo_main.cc

+++ b/ui/aura/demo/demo_main.cc

@@ -100,7 +100,8 @@ class DemoStackingClient : public aura::client::StackingClient {

}

// Overridden from aura::client::StackingClient:

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

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

+ aura::Window* window,

const gfx::Rect& bounds) OVERRIDE {

if (!capture_client_.get()) {

capture_client_.reset(