Second attempt at moving the StackingClient to a property on the RootWindow.

ui/aura_shell/stacking_controller.cc

 // Copyright (c) 2011 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 "ui/aura_shell/stacking_controller.h"
 
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/always_on_top_controller.h"
@@ skipping 11 matching lines @@
 bool IsWindowModal(aura::Window* window) {
   return window->transient_parent() && window->GetIntProperty(aura::kModalKey);
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // StackingController, public:
 
 StackingController::StackingController() {
-  aura::RootWindow::GetInstance()->SetStackingClient(this);
-}
-
-StackingController::~StackingController() {
-}
-
-void StackingController::Init() {
+  aura::client::SetStackingClient(this);
   always_on_top_controller_.reset(new internal::AlwaysOnTopController);
   always_on_top_controller_->SetContainers(
       GetContainer(internal::kShellWindowId_DefaultContainer),
       GetContainer(internal::kShellWindowId_AlwaysOnTopContainer));
 }
 
+StackingController::~StackingController() {
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // StackingController, aura::StackingClient implementation:
 
-void StackingController::AddChildToDefaultParent(aura::Window* window) {
-  aura::Window* parent = NULL;
+aura::Window* StackingController::GetDefaultParent(aura::Window* window) {
   switch (window->type()) {
     case aura::WINDOW_TYPE_NORMAL:
     case aura::WINDOW_TYPE_POPUP:
-      if (IsWindowModal(window)) {
-        parent = GetModalContainer(window);
-        break;
-      }
-      parent = always_on_top_controller_->GetContainer(window);
-      break;
+      if (IsWindowModal(window))
+        return GetModalContainer(window);
+      return always_on_top_controller_->GetContainer(window);
     case aura::WINDOW_TYPE_MENU:
     case aura::WINDOW_TYPE_TOOLTIP:
-      parent = GetContainer(internal::kShellWindowId_MenusAndTooltipsContainer);
-      break;
+      return GetContainer(internal::kShellWindowId_MenusAndTooltipsContainer);
     default:
       NOTREACHED() << "Window " << window->id()
                    << " has unhandled type " << window->type();
       break;
   }
-  parent->AddChild(window);
+  return NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // StackingController, private:
 
 aura::Window* StackingController::GetModalContainer(
     aura::Window* window) const {
   if (!IsWindowModal(window))
     return NULL;
 
@@ skipping 13 matching lines @@
   if (window_container_id < lock_container_id)
     container = GetContainer(internal::kShellWindowId_ModalContainer);
   else
     container = GetContainer(internal::kShellWindowId_LockModalContainer);
 
   return container;
 }
 
 }  // namespace internal
 }  // namespace aura_shell