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

ui/aura_shell/shell.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/shell.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 106 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, public:
 
 Shell::Shell(ShellDelegate* delegate)
     : ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
       accelerator_controller_(new ShellAcceleratorController),
       delegate_(delegate) {
   aura::RootWindow::GetInstance()->SetEventFilter(
       new internal::RootWindowEventFilter);
-  aura::RootWindow::GetInstance()->SetStackingClient(
-      new internal::StackingController);
 }
 
 Shell::~Shell() {
   RemoveRootWindowEventFilter(accelerator_filter_.get());
 
   // ShellTooltipManager needs a valid shell instance. We delete it before
   // deleting the shell |instance_|.
   RemoveRootWindowEventFilter(tooltip_manager_.get());
   aura::RootWindow::GetInstance()->SetProperty(
       aura::kRootWindowTooltipClientKey,
@@ skipping 50 matching lines @@
 
   aura::Window::Windows containers;
   CreateSpecialContainers(&containers);
   aura::Window::Windows::const_iterator i;
   for (i = containers.begin(); i != containers.end(); ++i) {
     (*i)->Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
     root_window->AddChild(*i);
     (*i)->Show();
   }
 
-  internal::StackingController* stacking_controller =
-      static_cast<internal::StackingController*>(
-          root_window->stacking_client());
-  stacking_controller->Init();
+  stacking_controller_.reset(new internal::StackingController);
 
   InitLayoutManagers(root_window);
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (!command_line->HasSwitch(switches::kAuraNoShadows))
     shadow_controller_.reset(new internal::ShadowController());
 
   // Force a layout.
   root_window->layout_manager()->OnWindowResized();
 
@@ skipping 122 matching lines @@
       new internal::WorkspaceController(default_container));
   workspace_controller_->SetLauncherModel(launcher_->model());
   default_container->SetEventFilter(
       new internal::DefaultContainerEventFilter(default_container));
   default_container->SetLayoutManager(
       new internal::DefaultContainerLayoutManager(
           workspace_controller_->workspace_manager()));
 }
 
 }  // namespace aura_shell