| Index: ui/views/animation/scroll_animator.h
|
| diff --git a/ui/views/animation/scroll_animator.h b/ui/views/animation/scroll_animator.h
|
| index 5473315f7f7dd11f32825e86ca4b9ef8775f30d8..d9b64c99a413eab4bcbef903dac1d2d10aab14a1 100644
|
| --- a/ui/views/animation/scroll_animator.h
|
| +++ b/ui/views/animation/scroll_animator.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef UI_VIEWS_ANIMATION_SCROLL_ANIMATOR_H_
|
| #define UI_VIEWS_ANIMATION_SCROLL_ANIMATOR_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "ui/gfx/animation/animation_delegate.h"
|
| #include "ui/views/views_export.h"
|
|
|
| @@ -53,7 +54,7 @@ class VIEWS_EXPORT ScrollAnimator : public gfx::AnimationDelegate {
|
| float duration_;
|
| float acceleration_;
|
|
|
| - scoped_ptr<gfx::SlideAnimation> animation_;
|
| + std::unique_ptr<gfx::SlideAnimation> animation_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ScrollAnimator);
|
| };
|
|
|