Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(583)

Side by Side Diff: ash/wm/overview/scoped_overview_animation_settings.h

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_H_ 5 #ifndef ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_H_
6 #define ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_H_ 6 #define ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_H_
7 7
8 #include <memory>
oshima 2016/04/08 07:09:42 remove this?
9
8 #include "ash/wm/overview/overview_animation_type.h" 10 #include "ash/wm/overview/overview_animation_type.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "ui/compositor/scoped_layer_animation_settings.h" 12 #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
17 namespace ash { 18 namespace ash {
18 19
19 // The ScopedOveriewAnimationSettings class correctly configures the animation 20 // The ScopedOveriewAnimationSettings class correctly configures the animation
20 // settings for an aura::Window for a given OverviewAnimationType. 21 // settings for an aura::Window for a given OverviewAnimationType.
21 class ScopedOverviewAnimationSettings { 22 class ScopedOverviewAnimationSettings {
22 public: 23 public:
23 ScopedOverviewAnimationSettings(OverviewAnimationType animation_type, 24 ScopedOverviewAnimationSettings(OverviewAnimationType animation_type,
24 aura::Window* window); 25 aura::Window* window);
25 virtual ~ScopedOverviewAnimationSettings(); 26 virtual ~ScopedOverviewAnimationSettings();
26 27
27 private: 28 private:
28 // The managed animation settings. 29 // The managed animation settings.
29 ui::ScopedLayerAnimationSettings animation_settings_; 30 ui::ScopedLayerAnimationSettings animation_settings_;
30 31
31 DISALLOW_COPY_AND_ASSIGN(ScopedOverviewAnimationSettings); 32 DISALLOW_COPY_AND_ASSIGN(ScopedOverviewAnimationSettings);
32 }; 33 };
33 34
34 } // namespace ash 35 } // namespace ash
35 36
36 #endif // ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_H_ 37 #endif // ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698