| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_DISPLAY_ANIMATOR_CHROMEOS_H_ | 5 #ifndef ASH_DISPLAY_DISPLAY_ANIMATOR_CHROMEOS_H_ |
| 6 #define ASH_DISPLAY_DISPLAY_ANIMATOR_CHROMEOS_H_ | 6 #define ASH_DISPLAY_DISPLAY_ANIMATOR_CHROMEOS_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> | 9 #include <memory> |
| 10 | 10 |
| 11 #include "ash/ash_export.h" | 11 #include "ash/ash_export.h" |
| 12 #include "ash/display/display_animator.h" | 12 #include "ash/display/display_animator.h" |
| 13 #include "base/callback.h" | 13 #include "base/callback.h" |
| 14 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 #include "base/memory/weak_ptr.h" | 15 #include "base/memory/weak_ptr.h" |
| 16 #include "base/timer/timer.h" | 16 #include "base/timer/timer.h" |
| 17 #include "ui/display/chromeos/display_configurator.h" | 17 #include "ui/display/chromeos/display_configurator.h" |
| 18 | 18 |
| 19 namespace aura { | 19 namespace aura { |
| 20 class RootWindow; | |
| 21 class Window; | 20 class Window; |
| 22 } // namespace aura | 21 } // namespace aura |
| 23 | 22 |
| 24 namespace ui { | 23 namespace ui { |
| 25 class Layer; | 24 class Layer; |
| 26 } // namespace ui | 25 } // namespace ui |
| 27 | 26 |
| 28 namespace ash { | 27 namespace ash { |
| 29 | 28 |
| 30 // DisplayAnimatorChromeOS provides the visual effects for | 29 // DisplayAnimatorChromeOS provides the visual effects for |
| (...skipping 27 matching lines...) Expand all Loading... |
| 58 std::map<aura::Window*, std::unique_ptr<ui::Layer>> hiding_layers_; | 57 std::map<aura::Window*, std::unique_ptr<ui::Layer>> hiding_layers_; |
| 59 std::unique_ptr<base::OneShotTimer> timer_; | 58 std::unique_ptr<base::OneShotTimer> timer_; |
| 60 base::WeakPtrFactory<DisplayAnimatorChromeOS> weak_ptr_factory_; | 59 base::WeakPtrFactory<DisplayAnimatorChromeOS> weak_ptr_factory_; |
| 61 | 60 |
| 62 DISALLOW_COPY_AND_ASSIGN(DisplayAnimatorChromeOS); | 61 DISALLOW_COPY_AND_ASSIGN(DisplayAnimatorChromeOS); |
| 63 }; | 62 }; |
| 64 | 63 |
| 65 } // namespace ash | 64 } // namespace ash |
| 66 | 65 |
| 67 #endif // ASH_DISPLAY_DISPLAY_ANIMATOR_CHROMEOS_H_ | 66 #endif // ASH_DISPLAY_DISPLAY_ANIMATOR_CHROMEOS_H_ |
| OLD | NEW |