| Index: ui/views/animation/ink_drop_host.h
|
| diff --git a/ui/views/animation/ink_drop_host.h b/ui/views/animation/ink_drop_host.h
|
| index 570f2710b4913ff3c2b4b659dff16f2fb07448d9..8d6dcb229e8087a98a2ac955995ce28e2f9921a1 100644
|
| --- a/ui/views/animation/ink_drop_host.h
|
| +++ b/ui/views/animation/ink_drop_host.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef UI_VIEWS_ANIMATION_INK_DROP_HOST_H_
|
| #define UI_VIEWS_ANIMATION_INK_DROP_HOST_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "ui/gfx/geometry/point.h"
|
| #include "ui/views/views_export.h"
|
|
|
| @@ -38,10 +39,10 @@ class VIEWS_EXPORT InkDropHost {
|
| virtual void RemoveInkDropLayer(ui::Layer* ink_drop_layer) = 0;
|
|
|
| // Creates and returns the effect used for press.
|
| - virtual scoped_ptr<InkDropAnimation> CreateInkDropAnimation() const = 0;
|
| + virtual std::unique_ptr<InkDropAnimation> CreateInkDropAnimation() const = 0;
|
|
|
| // Creates and returns the effect used for hover.
|
| - virtual scoped_ptr<InkDropHover> CreateInkDropHover() const = 0;
|
| + virtual std::unique_ptr<InkDropHover> CreateInkDropHover() const = 0;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(InkDropHost);
|
|
|