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

Unified Diff: ui/views/animation/bounds_animator.cc

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/animation/bounds_animator.h ('k') | ui/views/animation/bounds_animator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/bounds_animator.cc
diff --git a/ui/views/animation/bounds_animator.cc b/ui/views/animation/bounds_animator.cc
index ba9412722e0844a295be0002dede5deb952e7ab3..3f0e65fd0f0d3adcebc6bacf5abd06c3612b2342 100644
--- a/ui/views/animation/bounds_animator.cc
+++ b/ui/views/animation/bounds_animator.cc
@@ -4,7 +4,8 @@
#include "ui/views/animation/bounds_animator.h"
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
#include "ui/gfx/animation/animation_container.h"
#include "ui/gfx/animation/slide_animation.h"
#include "ui/views/animation/bounds_animator_observer.h"
@@ -89,14 +90,14 @@ void BoundsAnimator::SetAnimationForView(View* view,
SlideAnimation* animation) {
DCHECK(animation);
- scoped_ptr<SlideAnimation> animation_wrapper(animation);
+ std::unique_ptr<SlideAnimation> animation_wrapper(animation);
if (!IsAnimating(view))
return;
// We delay deleting the animation until the end so that we don't prematurely
// send out notification that we're done.
- scoped_ptr<Animation> old_animation(ResetAnimationForView(view));
+ std::unique_ptr<Animation> old_animation(ResetAnimationForView(view));
data_[view].animation = animation_wrapper.release();
animation_to_view_[animation] = view;
@@ -112,7 +113,7 @@ const SlideAnimation* BoundsAnimator::GetAnimationForView(View* view) {
void BoundsAnimator::SetAnimationDelegate(
View* view,
- scoped_ptr<AnimationDelegate> delegate) {
+ std::unique_ptr<AnimationDelegate> delegate) {
DCHECK(IsAnimating(view));
data_[view].delegate = delegate.release();
« no previous file with comments | « ui/views/animation/bounds_animator.h ('k') | ui/views/animation/bounds_animator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698