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

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

 // Copyright 2013 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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_controller.h"
@@ skipping 1640 matching lines @@
       profile_->GetPrefs(), root_window, prefs::kShelfAutoHideBehavior, value);
 
   if (root_window == ash::Shell::GetPrimaryRootWindow()) {
     // See comment in |kShelfAlignment| about why we have two prefs here.
     profile_->GetPrefs()->SetString(prefs::kShelfAutoHideBehaviorLocal, value);
     profile_->GetPrefs()->SetString(prefs::kShelfAutoHideBehavior, value);
   }
 }
 
 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);
   }
 }
 
 void ChromeLauncherController::SetShelfAlignmentFromPrefs() {
   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(
         GetPrefForRootWindow(profile_->GetPrefs(),
                              *iter,
                              prefs::kShelfAlignmentLocal,
                              prefs::kShelfAlignment));
     ash::ShelfAlignment alignment = ash::SHELF_ALIGNMENT_BOTTOM;
     if (alignment_value == ash::kShelfAlignmentLeft)
       alignment = ash::SHELF_ALIGNMENT_LEFT;
@@ skipping 371 matching lines @@
         }
       }
     }
   }
 
   // Finally we update the browser state itself.
   browser_status_monitor_->UpdateBrowserItemState();
 #endif
 }