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

Side by Side Diff: ui/views/animation/bounds_animator.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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
« no previous file with comments | « ui/views/accessible_pane_view_unittest.cc ('k') | ui/views/animation/bounds_animator.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 UI_VIEWS_ANIMATION_BOUNDS_ANIMATOR_H_ 5 #ifndef UI_VIEWS_ANIMATION_BOUNDS_ANIMATOR_H_
6 #define UI_VIEWS_ANIMATION_BOUNDS_ANIMATOR_H_ 6 #define UI_VIEWS_ANIMATION_BOUNDS_ANIMATOR_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory>
9 10
10 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "base/observer_list.h" 14 #include "base/observer_list.h"
15 #include "ui/gfx/animation/animation_container_observer.h" 15 #include "ui/gfx/animation/animation_container_observer.h"
16 #include "ui/gfx/animation/animation_delegate.h" 16 #include "ui/gfx/animation/animation_delegate.h"
17 #include "ui/gfx/animation/tween.h" 17 #include "ui/gfx/animation/tween.h"
18 #include "ui/gfx/geometry/rect.h" 18 #include "ui/gfx/geometry/rect.h"
19 #include "ui/views/views_export.h" 19 #include "ui/views/views_export.h"
20 20
21 namespace gfx { 21 namespace gfx {
22 class SlideAnimation; 22 class SlideAnimation;
23 } 23 }
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 // Returns the animation for the specified view. BoundsAnimator owns the 65 // Returns the animation for the specified view. BoundsAnimator owns the
66 // returned Animation. 66 // returned Animation.
67 const gfx::SlideAnimation* GetAnimationForView(View* view); 67 const gfx::SlideAnimation* GetAnimationForView(View* view);
68 68
69 // Stops animating the specified view. 69 // Stops animating the specified view.
70 void StopAnimatingView(View* view); 70 void StopAnimatingView(View* view);
71 71
72 // Sets the delegate for the animation for the specified view. 72 // Sets the delegate for the animation for the specified view.
73 void SetAnimationDelegate(View* view, 73 void SetAnimationDelegate(View* view,
74 scoped_ptr<gfx::AnimationDelegate> delegate); 74 std::unique_ptr<gfx::AnimationDelegate> delegate);
75 75
76 // Returns true if BoundsAnimator is animating the bounds of |view|. 76 // Returns true if BoundsAnimator is animating the bounds of |view|.
77 bool IsAnimating(View* view) const; 77 bool IsAnimating(View* view) const;
78 78
79 // Returns true if BoundsAnimator is animating any view. 79 // Returns true if BoundsAnimator is animating any view.
80 bool IsAnimating() const; 80 bool IsAnimating() const;
81 81
82 // Cancels all animations, leaving the views at their current location and 82 // Cancels all animations, leaving the views at their current location and
83 // size. Any views marked for deletion are deleted. 83 // size. Any views marked for deletion are deleted.
84 void Cancel(); 84 void Cancel();
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 int animation_duration_ms_; 178 int animation_duration_ms_;
179 179
180 gfx::Tween::Type tween_type_; 180 gfx::Tween::Type tween_type_;
181 181
182 DISALLOW_COPY_AND_ASSIGN(BoundsAnimator); 182 DISALLOW_COPY_AND_ASSIGN(BoundsAnimator);
183 }; 183 };
184 184
185 } // namespace views 185 } // namespace views
186 186
187 #endif // UI_VIEWS_ANIMATION_BOUNDS_ANIMATOR_H_ 187 #endif // UI_VIEWS_ANIMATION_BOUNDS_ANIMATOR_H_
OLDNEW
« no previous file with comments | « ui/views/accessible_pane_view_unittest.cc ('k') | ui/views/animation/bounds_animator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698