| 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 17b76ff01797f759dc53dc6d48c34aff4df140b9..737a8245969f0cf37a9c93cd4619dc4b69bc730f 100644
|
| --- a/ash/wm/overview/scoped_overview_animation_settings.h
|
| +++ b/ash/wm/overview/scoped_overview_animation_settings.h
|
| @@ -1,33 +1,17 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| +// Copyright 2016 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| #ifndef ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_H_
|
| #define ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_H_
|
|
|
| -#include "ash/wm/overview/overview_animation_type.h"
|
| -#include "base/macros.h"
|
| -#include "ui/compositor/scoped_layer_animation_settings.h"
|
| -
|
| -namespace aura {
|
| -class Window;
|
| -} // namespace aura
|
| -
|
| namespace ash {
|
|
|
| -// The ScopedOveriewAnimationSettings class correctly configures the animation
|
| -// settings for an aura::Window for a given OverviewAnimationType.
|
| +// ScopedOverviewAnimationSettings correctly configures the animation
|
| +// settings for a WmWindow given an OverviewAnimationType.
|
| class ScopedOverviewAnimationSettings {
|
| public:
|
| - ScopedOverviewAnimationSettings(OverviewAnimationType animation_type,
|
| - aura::Window* window);
|
| - virtual ~ScopedOverviewAnimationSettings();
|
| -
|
| - private:
|
| - // The managed animation settings.
|
| - ui::ScopedLayerAnimationSettings animation_settings_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(ScopedOverviewAnimationSettings);
|
| + virtual ~ScopedOverviewAnimationSettings() {}
|
| };
|
|
|
| } // namespace ash
|
|
|