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

trunk/src/ash/display/output_configurator_animation.cc

Index: trunk/src/ash/display/output_configurator_animation.cc
===================================================================
--- trunk/src/ash/display/output_configurator_animation.cc	(revision 233812)
+++ trunk/src/ash/display/output_configurator_animation.cc	(working copy)
@@ -114,11 +114,11 @@
   // hiding the root windows, we put a black layer over a root window for
   // safety.  These layers remain to hide root windows and will be deleted
   // after the animation of OnDisplayModeChanged().
-  aura::Window::Windows root_windows =
+  Shell::RootWindowList root_windows =
       Shell::GetInstance()->GetAllRootWindows();
-  for (aura::Window::Windows::const_iterator it = root_windows.begin();
+  for (Shell::RootWindowList::const_iterator it = root_windows.begin();
        it != root_windows.end(); ++it) {
-    aura::Window* root_window = *it;
+    aura::RootWindow* root_window = *it;
     ui::Layer* hiding_layer = new ui::Layer(ui::LAYER_SOLID_COLOR);
     hiding_layer->SetColor(SK_ColorBLACK);
     hiding_layer->SetBounds(root_window->bounds());
@@ -158,7 +158,7 @@
                  base::Unretained(this)));
 
   // Ensure that layers are not animating.
-  for (std::map<aura::Window*, ui::Layer*>::iterator it =
+  for (std::map<aura::RootWindow*, ui::Layer*>::iterator it =
            hiding_layers_.begin(); it != hiding_layers_.end(); ++it) {
     ui::LayerAnimator* animator = it->second->GetAnimator();
     if (animator->is_animating())
@@ -168,11 +168,11 @@
   // Schedules the fade-in effect for all root windows.  Because we put the
   // black layers for fade-out, here we actually turn those black layers
   // invisible.
-  aura::Window::Windows root_windows =
+  Shell::RootWindowList root_windows =
       Shell::GetInstance()->GetAllRootWindows();
-  for (aura::Window::Windows::const_iterator it = root_windows.begin();
+  for (Shell::RootWindowList::const_iterator it = root_windows.begin();
        it != root_windows.end(); ++it) {
-    aura::Window* root_window = *it;
+    aura::RootWindow* root_window = *it;
     ui::Layer* hiding_layer = NULL;
     if (hiding_layers_.find(root_window) == hiding_layers_.end()) {
       // In case of the transition from mirroring->non-mirroring, new root