ui/aura/desktop/desktop_stacking_client.cc - Issue 11362216: reland of https://codereview.chromium.org/11364053/ w/o removing the per-rootwindow stacking client

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/desktop/desktop_stacking_client.cc

Issue 11362216: reland of https://codereview.chromium.org/11364053/ w/o removing the per-rootwindow stacking client (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: fix dnwa 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:

View side-by-side diff with in-line comments

Download patch

Index: ui/aura/desktop/desktop_stacking_client.cc

diff --git a/ui/aura/desktop/desktop_stacking_client.cc b/ui/aura/desktop/desktop_stacking_client.cc

index ccc77954417ca4e1491a7b9aa739a4d437716ee2..6b79ea64cbd0a936f47da4f6e29ad030b031a223 100644

--- a/ui/aura/desktop/desktop_stacking_client.cc

+++ b/ui/aura/desktop/desktop_stacking_client.cc

@@ -17,7 +17,6 @@ namespace aura {

DesktopStackingClient::DesktopStackingClient()

: window_event_filter_(NULL) {

- client::SetStackingClient(this);

}

DesktopStackingClient::~DesktopStackingClient() {

@@ -27,7 +26,8 @@ DesktopStackingClient::~DesktopStackingClient() {

client::SetStackingClient(NULL);

}

-Window* DesktopStackingClient::GetDefaultParent(Window* window,

+Window* DesktopStackingClient::GetDefaultParent(Window* context,

+ Window* window,

const gfx::Rect& bounds) {

if (!null_parent_.get())

CreateNULLParent();

« no previous file with comments | « ui/aura/desktop/desktop_stacking_client.h ('k') | ui/aura/test/test_stacking_client.h » ('j') | no next file with comments »