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

ui/aura/window.cc

Index: ui/aura/window.cc
diff --git a/ui/aura/window.cc b/ui/aura/window.cc
index 1a2df24cff41851bb71dfcde85bc3be5e9f7636f..0c4f8c00bde1d0990184d9d0eda13375caf71694 100644
--- a/ui/aura/window.cc
+++ b/ui/aura/window.cc
@@ -33,19 +33,6 @@
 
 namespace aura {
 
-namespace {
-
-Window* GetParentForWindow(Window* window, Window* suggested_parent) {
-  if (suggested_parent)
-    return suggested_parent;
-  if (client::GetStackingClient())
-    return client::GetStackingClient()->GetDefaultParent(
-        window, window, gfx::Rect());
-  return NULL;
-}
-
-}  // namespace
-
 Window::TestApi::TestApi(Window* window) : window_(window) {}
 
 bool Window::TestApi::OwnsLayer() const {
@@ -333,8 +320,18 @@ void Window::SetExternalTexture(ui::Texture* texture) {
       WindowObserver, observers_, OnWindowPaintScheduled(this, region));
 }
 
-void Window::SetParent(Window* parent) {
-  GetParentForWindow(this, parent)->AddChild(this);
+void Window::SetDefaultParentByRootWindow(RootWindow* root_window,
+                                    const gfx::Rect& bounds) {

[oshima, 2012/11/27 00:14:30]

nit: indent & bounds -> bounds_in_screen

+  // TODO(erg): Enable this DCHECK once it is safe.
+  //  DCHECK(root_window);
+
+  // Stacking clients are mandatory on RootWindow objects.
+  client::StackingClient* client = client::GetStackingClient(root_window);
+  DCHECK(client);
+
+  aura::Window* default_parent = client->GetDefaultParent(
+      root_window, this, bounds);
+  default_parent->AddChild(this);
 }
 
 void Window::StackChildAtTop(Window* child) {