Add RootWindowController

ash/accelerators/accelerator_controller.cc

Index: ash/accelerators/accelerator_controller.cc
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 1c3da9ff18edd2d43e9c64e1438bec19b3995f4f..5c68272af5316a8ef3564304c13b50379b8dd950 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -15,6 +15,7 @@
 #include "ash/launcher/launcher_model.h"
 #include "ash/monitor/monitor_controller.h"
 #include "ash/monitor/multi_monitor_manager.h"
+#include "ash/root_window_controller.h"
 #include "ash/screenshot_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
@@ -112,9 +113,9 @@ bool HandleShowTaskManager() {
 
 // Rotates the default window container.
 bool HandleRotateWindows() {
-  aura::Window* target = Shell::GetContainer(
-      Shell::GetPrimaryRootWindow(),
-      internal::kShellWindowId_DefaultContainer);
+  aura::Window* target =
+      Shell::GetPrimaryRootWindowController()->GetContainer(
+          internal::kShellWindowId_DefaultContainer);
   scoped_ptr<ui::LayerAnimationSequence> screen_rotation(
       new ui::LayerAnimationSequence(new ui::ScreenRotation(360)));
   target->layer()->GetAnimator()->StartAnimation(
@@ -191,8 +192,8 @@ void PrintWindowHierarchy(aura::Window* window, int indent) {
 bool HandlePrintWindowHierarchy() {
   DLOG(INFO) << "Window hierarchy:";
   aura::Window* container =
-      Shell::GetContainer(Shell::GetPrimaryRootWindow(),
-                          internal::kShellWindowId_DefaultContainer);
+      Shell::GetPrimaryRootWindowController()->GetContainer(
+          internal::kShellWindowId_DefaultContainer);
   PrintWindowHierarchy(container, 0);
   return true;
 }