Index: ui/views/animation/button_ink_drop_delegate.h |
diff --git a/ui/views/animation/button_ink_drop_delegate.h b/ui/views/animation/button_ink_drop_delegate.h |
index f4c245ecdc1dac9d4473da1a25150980837eb118..336d1d349a50da045d186bc0ad54bbf293cd94e8 100644 |
--- a/ui/views/animation/button_ink_drop_delegate.h |
+++ b/ui/views/animation/button_ink_drop_delegate.h |
@@ -5,8 +5,9 @@ |
#ifndef UI_VIEWS_ANIMATION_BUTTON_INK_DROP_DELEGATE_H_ |
#define UI_VIEWS_ANIMATION_BUTTON_INK_DROP_DELEGATE_H_ |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "ui/events/event_handler.h" |
#include "ui/gfx/geometry/point.h" |
#include "ui/views/animation/ink_drop_delegate.h" |
@@ -47,7 +48,7 @@ class VIEWS_EXPORT ButtonInkDropDelegate : public InkDropDelegate, |
private: |
// An instance of ScopedTargetHandler allowing |this| to handle events. |
- scoped_ptr<ui::ScopedTargetHandler> target_handler_; |
+ std::unique_ptr<ui::ScopedTargetHandler> target_handler_; |
// Parent InkDropHost (typically a View) that hosts the ink ripple animations. |
InkDropHost* ink_drop_host_; |
@@ -57,7 +58,7 @@ class VIEWS_EXPORT ButtonInkDropDelegate : public InkDropDelegate, |
gfx::Point last_ink_drop_location_; |
// Animation controller for the ink drop ripple effect. |
- scoped_ptr<InkDropAnimationController> ink_drop_animation_controller_; |
+ std::unique_ptr<InkDropAnimationController> ink_drop_animation_controller_; |
DISALLOW_COPY_AND_ASSIGN(ButtonInkDropDelegate); |
}; |