| Index: trunk/src/ash/display/output_configurator_animation.h
|
| ===================================================================
|
| --- trunk/src/ash/display/output_configurator_animation.h (revision 233812)
|
| +++ trunk/src/ash/display/output_configurator_animation.h (working copy)
|
| @@ -14,7 +14,6 @@
|
|
|
| namespace aura {
|
| class RootWindow;
|
| -class Window;
|
| } // namespace aura
|
|
|
| namespace ui {
|
| @@ -55,7 +54,7 @@
|
| // 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);
|
|
|