OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_AURA_H_ | 5 #ifndef ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_AURA_H_ |
6 #define ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_AURA_H_ | 6 #define ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_AURA_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "ash/common/wm/overview/overview_animation_type.h" | 10 #include "ash/common/wm/overview/overview_animation_type.h" |
9 #include "ash/common/wm/overview/scoped_overview_animation_settings.h" | 11 #include "ash/common/wm/overview/scoped_overview_animation_settings.h" |
10 #include "base/macros.h" | 12 #include "base/macros.h" |
11 #include "ui/compositor/scoped_layer_animation_settings.h" | |
12 | 13 |
13 namespace aura { | 14 namespace aura { |
14 class Window; | 15 class Window; |
15 } // namespace aura | 16 } // namespace aura |
16 | 17 |
| 18 namespace ui { |
| 19 class ScopedLayerAnimationSettings; |
| 20 } // namespace ui |
| 21 |
17 namespace ash { | 22 namespace ash { |
18 | 23 |
19 // ScopedOverviewAnimationSettingsfor aura. | 24 // ScopedOverviewAnimationSettingsfor aura. |
20 class ScopedOverviewAnimationSettingsAura | 25 class ScopedOverviewAnimationSettingsAura |
21 : public ScopedOverviewAnimationSettings { | 26 : public ScopedOverviewAnimationSettings { |
22 public: | 27 public: |
23 ScopedOverviewAnimationSettingsAura(OverviewAnimationType animation_type, | 28 ScopedOverviewAnimationSettingsAura(OverviewAnimationType animation_type, |
24 aura::Window* window); | 29 aura::Window* window); |
25 ~ScopedOverviewAnimationSettingsAura() override; | 30 ~ScopedOverviewAnimationSettingsAura() override; |
| 31 void AddObserver(ui::ImplicitAnimationObserver* observer) override; |
26 | 32 |
27 private: | 33 private: |
28 // The managed animation settings. | 34 // The managed animation settings. |
29 ui::ScopedLayerAnimationSettings animation_settings_; | 35 std::unique_ptr<ui::ScopedLayerAnimationSettings> animation_settings_; |
30 | 36 |
31 DISALLOW_COPY_AND_ASSIGN(ScopedOverviewAnimationSettingsAura); | 37 DISALLOW_COPY_AND_ASSIGN(ScopedOverviewAnimationSettingsAura); |
32 }; | 38 }; |
33 | 39 |
34 } // namespace ash | 40 } // namespace ash |
35 | 41 |
36 #endif // ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_AURA_H_ | 42 #endif // ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_AURA_H_ |
OLD | NEW |