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

> Eliminate Shell::RootWindowList in favor of aura::Window::Windows.
> 
> This is necessary as part of my plan to rework RootWindow, specifically making it not be a subclass of Window. (It will eventually be renamed WindowEventDispatcher). Code that expected to get the RootWindow interface from this type can still call GetDispatcher() on members of the returned vector of Windows.
> 
> R=oshima@chromium.org
> http://crbug.com/308843
> 
> Review URL: https://codereview.chromium.org/64933002

TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/59153004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233813 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 5 deletions

diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index b4acff9..efb9098 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -329,11 +329,10 @@ bool HandleMediaPrevTrack() {
 }
 
 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;
 }
diff --git a/ash/accelerators/accelerator_filter.cc b/ash/accelerators/accelerator_filter.cc
index 1ce80c7..57ac695 100644
--- a/ash/accelerators/accelerator_filter.cc
+++ b/ash/accelerators/accelerator_filter.cc
@@ -58,7 +58,7 @@ bool ShouldProcessAcceleratorsNow(const ui::Accelerator& accelerator,
   if (!target)
     return true;
 
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   if (std::find(root_windows.begin(), root_windows.end(), target) !=
       root_windows.end())
     return true;