| Index: cc/input/scrollbar_animation_controller_linear_fade.h
|
| diff --git a/cc/input/scrollbar_animation_controller_linear_fade.h b/cc/input/scrollbar_animation_controller_linear_fade.h
|
| index 356c2cd5df7ac187433d44af2043787ca9e6b3c4..f5993e7149a6148adb9ed3087b01623580cea948 100644
|
| --- a/cc/input/scrollbar_animation_controller_linear_fade.h
|
| +++ b/cc/input/scrollbar_animation_controller_linear_fade.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef CC_INPUT_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_
|
| #define CC_INPUT_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "cc/base/cc_export.h"
|
| #include "cc/input/scrollbar_animation_controller.h"
|
|
|
| @@ -16,7 +17,7 @@ class LayerImpl;
|
| class CC_EXPORT ScrollbarAnimationControllerLinearFade
|
| : public ScrollbarAnimationController {
|
| public:
|
| - static scoped_ptr<ScrollbarAnimationControllerLinearFade> Create(
|
| + static std::unique_ptr<ScrollbarAnimationControllerLinearFade> Create(
|
| int scroll_layer_id,
|
| ScrollbarAnimationControllerClient* client,
|
| base::TimeDelta delay_before_starting,
|
|
|