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

trunk/src/ash/display/display_controller.cc

Index: trunk/src/ash/display/display_controller.cc
===================================================================
--- trunk/src/ash/display/display_controller.cc	(revision 233812)
+++ trunk/src/ash/display/display_controller.cc	(working copy)
@@ -341,8 +341,8 @@
   }
 }
 
-aura::Window::Windows DisplayController::GetAllRootWindows() {
-  aura::Window::Windows windows;
+std::vector<aura::RootWindow*> DisplayController::GetAllRootWindows() {
+  std::vector<aura::RootWindow*> windows;
   for (std::map<int64, aura::RootWindow*>::const_iterator it =
            root_windows_.begin(); it != root_windows_.end(); ++it) {
     DCHECK(it->second);
@@ -790,7 +790,7 @@
   // to "aura_root_0" so gtalk can find the primary root window to broadcast.
   // TODO(jhorwich) Remove this once Chrome supports window-based broadcasting.
   aura::Window* primary = Shell::GetPrimaryRootWindow();
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   for (size_t i = 0; i < root_windows.size(); ++i) {
     std::string name =
         root_windows[i] == primary ? "aura_root_0" : "aura_root_x";