| Index: ui/views/animation/ink_drop_host_view.h
|
| diff --git a/ui/views/animation/ink_drop_host_view.h b/ui/views/animation/ink_drop_host_view.h
|
| index 3a3efa6b6ed6be0ef124608917105695447f8824..35f712c0063bf724985dc117389d61868f233f97 100644
|
| --- a/ui/views/animation/ink_drop_host_view.h
|
| +++ b/ui/views/animation/ink_drop_host_view.h
|
| @@ -5,7 +5,8 @@
|
| #ifndef UI_VIEWS_ANIMATION_INK_DROP_HOST_VIEW_H_
|
| #define UI_VIEWS_ANIMATION_INK_DROP_HOST_VIEW_H_
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "third_party/skia/include/core/SkColor.h"
|
| #include "ui/gfx/geometry/size.h"
|
| #include "ui/views/animation/ink_drop_host.h"
|
| @@ -25,8 +26,8 @@ class VIEWS_EXPORT InkDropHostView : public views::View, public InkDropHost {
|
| // Overridden from views::InkDropHost:
|
| void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
|
| void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
|
| - scoped_ptr<InkDropAnimation> CreateInkDropAnimation() const override;
|
| - scoped_ptr<InkDropHover> CreateInkDropHover() const override;
|
| + std::unique_ptr<InkDropAnimation> CreateInkDropAnimation() const override;
|
| + std::unique_ptr<InkDropHover> CreateInkDropHover() const override;
|
|
|
| void set_ink_drop_size(const gfx::Size& size) { ink_drop_size_ = size; }
|
|
|
|
|