| Index: cc/blink/scrollbar_impl.h
|
| diff --git a/cc/blink/scrollbar_impl.h b/cc/blink/scrollbar_impl.h
|
| index 5f11a1b407e816fe3095a110edd8b0627d6456ac..4e4bdaedc25e7a5e2e304a71280cb06c61b7ebd1 100644
|
| --- a/cc/blink/scrollbar_impl.h
|
| +++ b/cc/blink/scrollbar_impl.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef CC_BLINK_SCROLLBAR_IMPL_H_
|
| #define CC_BLINK_SCROLLBAR_IMPL_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "cc/input/scrollbar.h"
|
| #include "third_party/WebKit/public/platform/WebScrollbarThemePainter.h"
|
|
|
| @@ -19,9 +20,9 @@ namespace cc_blink {
|
|
|
| class ScrollbarImpl : public cc::Scrollbar {
|
| public:
|
| - ScrollbarImpl(scoped_ptr<blink::WebScrollbar> scrollbar,
|
| + ScrollbarImpl(std::unique_ptr<blink::WebScrollbar> scrollbar,
|
| blink::WebScrollbarThemePainter painter,
|
| - scoped_ptr<blink::WebScrollbarThemeGeometry> geometry);
|
| + std::unique_ptr<blink::WebScrollbarThemeGeometry> geometry);
|
| ~ScrollbarImpl() override;
|
|
|
| // cc::Scrollbar implementation.
|
| @@ -40,9 +41,9 @@ class ScrollbarImpl : public cc::Scrollbar {
|
| const gfx::Rect& content_rect) override;
|
|
|
| private:
|
| - scoped_ptr<blink::WebScrollbar> scrollbar_;
|
| + std::unique_ptr<blink::WebScrollbar> scrollbar_;
|
| blink::WebScrollbarThemePainter painter_;
|
| - scoped_ptr<blink::WebScrollbarThemeGeometry> geometry_;
|
| + std::unique_ptr<blink::WebScrollbarThemeGeometry> geometry_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ScrollbarImpl);
|
| };
|
|
|