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

trunk/src/ash/display/output_configurator_animation.h

 // 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.
 
 #ifndef ASH_DISPLAY_OUTPUT_CONFIGURATOR_ANIMATION_H_
 #define ASH_DISPLAY_OUTPUT_CONFIGURATOR_ANIMATION_H_
 
 #include <map>
 
 #include "ash/ash_export.h"
 #include "base/callback.h"
 #include "base/timer/timer.h"
 #include "chromeos/display/output_configurator.h"
 
 namespace aura {
 class RootWindow;
-class Window;
 }  // namespace aura
 
 namespace ui {
 class Layer;
 }  // namespace ui
 
 namespace ash {
 namespace internal {
 
 // OutputConfiguratorAnimation provides the visual effects for
@@ skipping 20 matching lines @@
       OVERRIDE;
   virtual void OnDisplayModeChangeFailed(
       chromeos::OutputState failed_new_state) OVERRIDE;
 
  private:
   // Clears all hiding layers.  Note that in case that this method is called
   // during an animation, the method call will cancel all of the animations
   // and *not* call the registered callback.
   void ClearHidingLayers();
 
-  std::map<aura::Window*, ui::Layer*> hiding_layers_;
+  std::map<aura::RootWindow*, ui::Layer*> hiding_layers_;
   scoped_ptr<base::OneShotTimer<OutputConfiguratorAnimation> > timer_;
 
   DISALLOW_COPY_AND_ASSIGN(OutputConfiguratorAnimation);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_OUTPUT_CONFIGURATION_CONTROLLER_H_