| 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> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "ash/common/wm/overview/overview_animation_type.h" | 10 #include "ash/wm/overview/overview_animation_type.h" |
| 11 #include "ash/common/wm/overview/scoped_overview_animation_settings.h" | 11 #include "ash/wm/overview/scoped_overview_animation_settings.h" |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 | 13 |
| 14 namespace aura { | 14 namespace aura { |
| 15 class Window; | 15 class Window; |
| 16 } // namespace aura | 16 } // namespace aura |
| 17 | 17 |
| 18 namespace ui { | 18 namespace ui { |
| 19 class ScopedLayerAnimationSettings; | 19 class ScopedLayerAnimationSettings; |
| 20 } // namespace ui | 20 } // namespace ui |
| 21 | 21 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 33 private: | 33 private: |
| 34 // The managed animation settings. | 34 // The managed animation settings. |
| 35 std::unique_ptr<ui::ScopedLayerAnimationSettings> animation_settings_; | 35 std::unique_ptr<ui::ScopedLayerAnimationSettings> animation_settings_; |
| 36 | 36 |
| 37 DISALLOW_COPY_AND_ASSIGN(ScopedOverviewAnimationSettingsAura); | 37 DISALLOW_COPY_AND_ASSIGN(ScopedOverviewAnimationSettingsAura); |
| 38 }; | 38 }; |
| 39 | 39 |
| 40 } // namespace ash | 40 } // namespace ash |
| 41 | 41 |
| 42 #endif // ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_AURA_H_ | 42 #endif // ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_AURA_H_ |
| OLD | NEW |