| Index: ash/wm/overview/scoped_overview_animation_settings.h
|
| diff --git a/ash/wm/overview/scoped_overview_animation_settings.h b/ash/wm/overview/scoped_overview_animation_settings.h
|
| index a8898bfb45190bb587673c19781fc0d1ab9af912..4734cf8f8a6f86b443cd68f93c4b8d8956b0c696 100644
|
| --- a/ash/wm/overview/scoped_overview_animation_settings.h
|
| +++ b/ash/wm/overview/scoped_overview_animation_settings.h
|
| @@ -5,18 +5,36 @@
|
| #ifndef ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_H_
|
| #define ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_H_
|
|
|
| +#include <memory>
|
| +
|
| +#include "ash/wm/overview/overview_animation_type.h"
|
| +#include "base/macros.h"
|
| +
|
| +namespace aura {
|
| +class Window;
|
| +} // namespace aura
|
| +
|
| namespace ui {
|
| class ImplicitAnimationObserver;
|
| +class ScopedLayerAnimationSettings;
|
| } // namespace ui
|
|
|
| namespace ash {
|
|
|
| // ScopedOverviewAnimationSettings correctly configures the animation
|
| -// settings for a WmWindow given an OverviewAnimationType.
|
| +// settings for an aura::Window given an OverviewAnimationType.
|
| class ScopedOverviewAnimationSettings {
|
| public:
|
| - virtual ~ScopedOverviewAnimationSettings() {}
|
| - virtual void AddObserver(ui::ImplicitAnimationObserver* observer) = 0;
|
| + ScopedOverviewAnimationSettings(OverviewAnimationType animation_type,
|
| + aura::Window* window);
|
| + ~ScopedOverviewAnimationSettings();
|
| + void AddObserver(ui::ImplicitAnimationObserver* observer);
|
| +
|
| + private:
|
| + // The managed animation settings.
|
| + std::unique_ptr<ui::ScopedLayerAnimationSettings> animation_settings_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(ScopedOverviewAnimationSettings);
|
| };
|
|
|
| } // namespace ash
|
|
|