Revert 233787 "Eliminate Shell::RootWindowList in favor of aura:..."

trunk/src/ash/accelerators/accelerator_controller.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/accelerators/accelerator_controller.h"
 
 #include <algorithm>
 #include <cmath>
 #include <iostream>
 #include <string>
@@ skipping 311 matching lines @@
   Shell::GetInstance()->media_delegate()->HandleMediaPlayPause();
   return true;
 }
 
 bool HandleMediaPrevTrack() {
   Shell::GetInstance()->media_delegate()->HandleMediaPrevTrack();
   return true;
 }
 
 bool HandlePrintLayerHierarchy() {
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   for (size_t i = 0; i < root_windows.size(); ++i) {
-    ui::PrintLayerHierarchy(
-        root_windows[i]->layer(),
-        root_windows[i]->GetDispatcher()->GetLastMouseLocationInRoot());
+    ui::PrintLayerHierarchy(root_windows[i]->layer(),
+                            root_windows[i]->GetLastMouseLocationInRoot());
   }
   return true;
 }
 
 bool HandlePrintViewHierarchy() {
   aura::Window* active_window = ash::wm::GetActiveWindow();
   if (!active_window)
     return true;
   views::Widget* browser_widget =
       views::Widget::GetWidgetForNativeWindow(active_window);
@@ skipping 648 matching lines @@
     keyboard_brightness_control_delegate) {
   keyboard_brightness_control_delegate_ =
       keyboard_brightness_control_delegate.Pass();
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash