| Index: ui/views/animation/ink_drop_host_view.cc
|
| diff --git a/ui/views/animation/ink_drop_host_view.cc b/ui/views/animation/ink_drop_host_view.cc
|
| index ab55881611f0a8bf65904f434f487d3fbfc29203..1070f031d2156ecc6666a8961209e5c770fdd79d 100644
|
| --- a/ui/views/animation/ink_drop_host_view.cc
|
| +++ b/ui/views/animation/ink_drop_host_view.cc
|
| @@ -34,18 +34,19 @@ void InkDropHostView::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
|
| SetPaintToLayer(false);
|
| }
|
|
|
| -scoped_ptr<InkDropAnimation> InkDropHostView::CreateInkDropAnimation() const {
|
| +std::unique_ptr<InkDropAnimation> InkDropHostView::CreateInkDropAnimation()
|
| + const {
|
| gfx::Size large_drop(ink_drop_size_.width() * 4 / 3,
|
| ink_drop_size_.height() * 4 / 3);
|
|
|
| - scoped_ptr<InkDropAnimation> animation(new SquareInkDropAnimation(
|
| + std::unique_ptr<InkDropAnimation> animation(new SquareInkDropAnimation(
|
| large_drop, kInkDropLargeCornerRadius, ink_drop_size_,
|
| kInkDropSmallCornerRadius, GetInkDropCenter(), GetInkDropBaseColor()));
|
| return animation;
|
| }
|
|
|
| -scoped_ptr<InkDropHover> InkDropHostView::CreateInkDropHover() const {
|
| - scoped_ptr<InkDropHover> hover(
|
| +std::unique_ptr<InkDropHover> InkDropHostView::CreateInkDropHover() const {
|
| + std::unique_ptr<InkDropHover> hover(
|
| new InkDropHover(ink_drop_size_, kInkDropSmallCornerRadius,
|
| GetInkDropCenter(), GetInkDropBaseColor()));
|
| return hover;
|
|
|