| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef ASH_DISPLAY_OUTPUT_CONFIGURATOR_ANIMATION_H_ | 5 #ifndef ASH_DISPLAY_OUTPUT_CONFIGURATOR_ANIMATION_H_ |
| 6 #define ASH_DISPLAY_OUTPUT_CONFIGURATOR_ANIMATION_H_ | 6 #define ASH_DISPLAY_OUTPUT_CONFIGURATOR_ANIMATION_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| 11 #include "base/callback.h" | 11 #include "base/callback.h" |
| 12 #include "base/timer/timer.h" | 12 #include "base/timer/timer.h" |
| 13 #include "ui/display/chromeos/output_configurator.h" | 13 #include "ui/display/chromeos/output_configurator.h" |
| 14 | 14 |
| 15 namespace aura { | 15 namespace aura { |
| 16 class RootWindow; | 16 class RootWindow; |
| 17 class Window; | 17 class Window; |
| 18 } // namespace aura | 18 } // namespace aura |
| 19 | 19 |
| 20 namespace ui { | 20 namespace ui { |
| 21 class Layer; | 21 class Layer; |
| 22 } // namespace ui | 22 } // namespace ui |
| 23 | 23 |
| 24 namespace ash { | 24 namespace ash { |
| 25 namespace internal { | |
| 26 | 25 |
| 27 // OutputConfiguratorAnimation provides the visual effects for | 26 // OutputConfiguratorAnimation provides the visual effects for |
| 28 // ui::OutputConfigurator, such like fade-out/in during changing | 27 // ui::OutputConfigurator, such like fade-out/in during changing |
| 29 // the display mode. | 28 // the display mode. |
| 30 class ASH_EXPORT OutputConfiguratorAnimation | 29 class ASH_EXPORT OutputConfiguratorAnimation |
| 31 : public ui::OutputConfigurator::Observer { | 30 : public ui::OutputConfigurator::Observer { |
| 32 public: | 31 public: |
| 33 OutputConfiguratorAnimation(); | 32 OutputConfiguratorAnimation(); |
| 34 virtual ~OutputConfiguratorAnimation(); | 33 virtual ~OutputConfiguratorAnimation(); |
| 35 | 34 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 53 // during an animation, the method call will cancel all of the animations | 52 // during an animation, the method call will cancel all of the animations |
| 54 // and *not* call the registered callback. | 53 // and *not* call the registered callback. |
| 55 void ClearHidingLayers(); | 54 void ClearHidingLayers(); |
| 56 | 55 |
| 57 std::map<aura::Window*, ui::Layer*> hiding_layers_; | 56 std::map<aura::Window*, ui::Layer*> hiding_layers_; |
| 58 scoped_ptr<base::OneShotTimer<OutputConfiguratorAnimation> > timer_; | 57 scoped_ptr<base::OneShotTimer<OutputConfiguratorAnimation> > timer_; |
| 59 | 58 |
| 60 DISALLOW_COPY_AND_ASSIGN(OutputConfiguratorAnimation); | 59 DISALLOW_COPY_AND_ASSIGN(OutputConfiguratorAnimation); |
| 61 }; | 60 }; |
| 62 | 61 |
| 63 } // namespace internal | |
| 64 } // namespace ash | 62 } // namespace ash |
| 65 | 63 |
| 66 #endif // ASH_DISPLAY_OUTPUT_CONFIGURATION_CONTROLLER_H_ | 64 #endif // ASH_DISPLAY_OUTPUT_CONFIGURATION_CONTROLLER_H_ |
| OLD | NEW |