Desktop aura: Break aura::Window::SetParent in two.

ash/wm/workspace/workspace_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/workspace/workspace_manager.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "ash/ash_switches.h"
@@ skipping 44 matching lines @@
 // Amount of time to pause before animating anything. Only used during initial
 // animation (when logging in).
 const int kInitialPauseTimeMS = 750;
 
 // Changes the parent of |window| and all its transient children to
 // |new_parent|. If |stack_beneach| is non-NULL all the windows are stacked
 // beneath it.
 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)
     ReparentWindow(window->transient_children()[i], new_parent, stack_beneath);
 }
 
 }  // namespace
 
 // Workspace -------------------------------------------------------------------
 
@@ skipping 660 matching lines @@
     new_workspace->window()->Show();
   ReparentWindow(window, new_workspace->window(), NULL);
   if (is_active) {
     SetActiveWorkspace(new_workspace, SWITCH_TRACKED_BY_WORKSPACE_CHANGED,
                        base::TimeDelta());
   }
 }
 
 }  // namespace internal
 }  // namespace ash