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

trunk/src/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

Index: trunk/src/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
===================================================================
--- trunk/src/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc	(revision 233812)
+++ trunk/src/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc	(working copy)
@@ -1658,9 +1658,9 @@
 }
 
 void ChromeLauncherController::SetShelfAutoHideBehaviorFromPrefs() {
-  aura::Window::Windows root_windows = ash::Shell::GetAllRootWindows();
+  ash::Shell::RootWindowList root_windows = ash::Shell::GetAllRootWindows();
 
-  for (aura::Window::Windows::const_iterator iter = root_windows.begin();
+  for (ash::Shell::RootWindowList::const_iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter) {
     ash::Shell::GetInstance()->SetShelfAutoHideBehavior(
         GetShelfAutoHideBehavior(*iter), *iter);
@@ -1671,9 +1671,9 @@
   if (!ash::ShelfWidget::ShelfAlignmentAllowed())
     return;
 
-  aura::Window::Windows root_windows = ash::Shell::GetAllRootWindows();
+  ash::Shell::RootWindowList root_windows = ash::Shell::GetAllRootWindows();
 
-  for (aura::Window::Windows::const_iterator iter = root_windows.begin();
+  for (ash::Shell::RootWindowList::const_iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter) {
     // See comment in |kShelfAlignment| as to why we consider two prefs.
     const std::string alignment_value(