Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(250)

Unified Diff: ui/events/gestures/gesture_recognizer_impl.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/gestures/gesture_recognizer_impl.h ('k') | ui/events/gestures/motion_event_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« no previous file with comments | « ui/events/gestures/gesture_recognizer_impl.h ('k') | ui/events/gestures/motion_event_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698