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

trunk/src/ash/display/output_configurator_animation.cc

 // Copyright (c) 2012 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 "ash/display/output_configurator_animation.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "base/bind.h"
 #include "base/stl_util.h"
@@ skipping 96 matching lines @@
 
 void OutputConfiguratorAnimation::StartFadeOutAnimation(
     base::Closure callback) {
   CallbackRunningObserver* observer = new CallbackRunningObserver(callback);
   ClearHidingLayers();
 
   // Make the fade-out animation for all root windows.  Instead of actually
   // 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());
     ui::Layer* parent = ash::Shell::GetContainer(
         root_window,
         ash::internal::kShellWindowId_OverlayContainer)->layer();
     parent->Add(hiding_layer);
 
     hiding_layer->SetOpacity(0.0);
 
@@ skipping 19 matching lines @@
 void OutputConfiguratorAnimation::StartFadeInAnimation() {
   // We want to make sure clearing all of hiding layers after the animation
   // finished.  Note that this callback can be canceled, but the cancel only
   // happens when the next animation is scheduled.  Thus the hiding layers
   // should be deleted eventually.
   CallbackRunningObserver* observer = new CallbackRunningObserver(
       base::Bind(&OutputConfiguratorAnimation::ClearHidingLayers,
                  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())
       animator->StopAnimating();
   }
 
   // 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
       // windows appear and we do not have the black layers for them.  Thus
       // we need to create the layer and make it visible.
       hiding_layer = new ui::Layer(ui::LAYER_SOLID_COLOR);
       hiding_layer->SetColor(SK_ColorBLACK);
       hiding_layer->SetBounds(root_window->bounds());
       ui::Layer* parent = ash::Shell::GetContainer(
           root_window,
@@ skipping 34 matching lines @@
     timer_->Stop();
     timer_.reset();
   }
   STLDeleteContainerPairSecondPointers(
       hiding_layers_.begin(), hiding_layers_.end());
   hiding_layers_.clear();
 }
 
 }  // namespace internal
 }  // namespace ash