| Index: ui/events/gestures/gesture_recognizer_impl.cc
|
| diff --git a/ui/events/gestures/gesture_recognizer_impl.cc b/ui/events/gestures/gesture_recognizer_impl.cc
|
| index 9054af01dedd8c7e2fee3359a1ef48fcbfc12a0a..7f27c8f78be3b62f686d58e8b0f0a7b0887b0c9e 100644
|
| --- a/ui/events/gestures/gesture_recognizer_impl.cc
|
| +++ b/ui/events/gestures/gesture_recognizer_impl.cc
|
| @@ -7,10 +7,10 @@
|
| #include <stddef.h>
|
|
|
| #include <limits>
|
| +#include <memory>
|
|
|
| #include "base/command_line.h"
|
| #include "base/logging.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/time/time.h"
|
| #include "ui/events/event.h"
|
| @@ -163,7 +163,7 @@ bool GestureRecognizerImpl::CancelActiveTouches(GestureConsumer* consumer) {
|
| if (pointer_state.GetPointerCount() == 0)
|
| return false;
|
| // pointer_state is modified every time after DispatchCancelTouchEvent.
|
| - scoped_ptr<MotionEvent> pointer_state_clone = pointer_state.Clone();
|
| + std::unique_ptr<MotionEvent> pointer_state_clone = pointer_state.Clone();
|
| for (size_t i = 0; i < pointer_state_clone->GetPointerCount(); ++i) {
|
| TouchEvent touch_event(ui::ET_TOUCH_CANCELLED, gfx::Point(),
|
| ui::EF_IS_SYNTHESIZED,
|
|
|