ash/wm/workspace/workspace_manager.cc - Issue 11421006: Desktop aura: Break aura::Window::SetParent in two.

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: ash/wm/workspace/workspace_manager.cc

Issue 11421006: Desktop aura: Break aura::Window::SetParent in two. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix ash_unittests 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: ash/wm/workspace/workspace_manager.cc

diff --git a/ash/wm/workspace/workspace_manager.cc b/ash/wm/workspace/workspace_manager.cc

index af598e8956af08951a6fcde93b6937a956cb944a..3f1c6280a7bc554ba9bd34c270196de258c45da3 100644

--- a/ash/wm/workspace/workspace_manager.cc

+++ b/ash/wm/workspace/workspace_manager.cc

@@ -62,7 +62,7 @@ const int kInitialPauseTimeMS = 750;

void ReparentWindow(Window* window,

Window* new_parent,

Window* stack_beneath) {

- window->SetParent(new_parent);

+ new_parent->AddChild(window);

if (stack_beneath)

new_parent->StackChildBelow(window, stack_beneath);

for (size_t i = 0; i < window->transient_children().size(); ++i)