Remove the singleton instance get/delete methods from RootWindow (yay)

ash/shell.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/shell.h"
 
 #include <algorithm>
 
 #include "ash/app_list/app_list.h"
 #include "ash/ash_switches.h"
@@ skipping 252 matching lines @@
 }
 
 internal::WorkspaceController* Shell::TestApi::workspace_controller() {
   return shell_->workspace_controller_.get();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, public:
 
 Shell::Shell(ShellDelegate* delegate)
-    : root_filter_(new internal::RootWindowEventFilter),
-#if !defined(OS_MACOSX)
-      nested_dispatcher_controller_(new NestedDispatcherController),
-      accelerator_controller_(new AcceleratorController),
-#endif
+    : root_window_(new aura::RootWindow),
       delegate_(delegate),
       audio_controller_(NULL),
       brightness_controller_(NULL),
       shelf_(NULL),
       window_mode_(MODE_OVERLAPPING),
       desktop_background_mode_(BACKGROUND_IMAGE),
       root_window_layout_(NULL),
       status_widget_(NULL) {
-  // Pass ownership of the filter to the root window.
-  GetRootWindow()->SetEventFilter(root_filter_);
 }
 
 Shell::~Shell() {
   RemoveRootWindowEventFilter(partial_screenshot_filter_.get());
   RemoveRootWindowEventFilter(input_method_filter_.get());
   RemoveRootWindowEventFilter(window_modality_controller_.get());
 #if !defined(OS_MACOSX)
   RemoveRootWindowEventFilter(accelerator_filter_.get());
 #endif
 
@@ skipping 15 matching lines @@
   // Delete containers now so that child windows does not access
   // observers when they are destructed.
   aura::RootWindow* root_window = GetRootWindow();
   while (!root_window->children().empty()) {
     aura::Window* child = root_window->children()[0];
     delete child;
   }
 
   // These need a valid Shell instance to clean up properly, so explicitly
   // delete them before invalidating the instance.
+  // Alphabetical.
+  activation_controller_.reset();
   drag_drop_controller_.reset();
+  shadow_controller_.reset();
   window_cycle_controller_.reset();
 
   // Launcher widget has a InputMethodBridge that references to
   // input_method_filter_'s input_method_. So explicitly release launcher_
   // before input_method_filter_. And this needs to be after we delete all
   // containers in case there are still live browser windows which access
   // LauncherModel during close.
   launcher_.reset();
 
   DCHECK(instance_ == this);
@@ skipping 15 matching lines @@
 }
 
 // static
 void Shell::DeleteInstance() {
   delete instance_;
   instance_ = NULL;
 }
 
 // static
 aura::RootWindow* Shell::GetRootWindow() {
-  return aura::RootWindow::GetInstance();
+  return GetInstance()->root_window_.get();
 }
 
 void Shell::Init() {
+  root_filter_ = new internal::RootWindowEventFilter;
+#if !defined(OS_MACOSX)
+  nested_dispatcher_controller_.reset(new NestedDispatcherController);
+  accelerator_controller_.reset(new AcceleratorController);
+#endif
+  // Pass ownership of the filter to the root window.
+  GetRootWindow()->SetEventFilter(root_filter_);
+
   DCHECK(!GetRootWindowEventFilterCount());
 
   // PartialScreenshotEventFilter must be the first one to capture key
   // events when the taking partial screenshot UI is there.
   partial_screenshot_filter_.reset(new internal::PartialScreenshotEventFilter);
   AddRootWindowEventFilter(partial_screenshot_filter_.get());
 
   // Then AcceleratorFilter and InputMethodEventFilter must be added (in this
   // order) since they have the second highest priority.
   DCHECK_EQ(1U, GetRootWindowEventFilterCount());
@@ skipping 282 matching lines @@
 
   // Create the desktop background image.
   SetDesktopBackgroundMode(BACKGROUND_IMAGE);
 }
 
 void Shell::ResetLayoutManager(int container_id) {
   GetContainer(container_id)->SetLayoutManager(NULL);
 }
 
 }  // namespace ash