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

Unified Diff: ui/events/gesture_detection/gesture_detector.h

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/event_utils.cc ('k') | ui/events/gesture_detection/gesture_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/gesture_detection/gesture_detector.h
diff --git a/ui/events/gesture_detection/gesture_detector.h b/ui/events/gesture_detection/gesture_detector.h
index 9fb699985f2aeb635685017af3c3f256c3b95759..4788be870eb6167a7d00b79c80ab9d81bb53d049 100644
--- a/ui/events/gesture_detection/gesture_detector.h
+++ b/ui/events/gesture_detection/gesture_detector.h
@@ -5,9 +5,10 @@
#ifndef UI_EVENTS_GESTURE_DETECTION_GESTURE_DETECTOR_H_
#define UI_EVENTS_GESTURE_DETECTION_GESTURE_DETECTOR_H_
+#include <memory>
+
#include "base/logging.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/events/gesture_detection/gesture_detection_export.h"
#include "ui/events/gesture_detection/velocity_tracker_state.h"
@@ -111,7 +112,7 @@ class GESTURE_DETECTION_EXPORT GestureDetector {
bool HandleSwipeIfNeeded(const MotionEvent& up, float vx, float vy);
class TimeoutGestureHandler;
- scoped_ptr<TimeoutGestureHandler> timeout_handler_;
+ std::unique_ptr<TimeoutGestureHandler> timeout_handler_;
GestureListener* const listener_;
DoubleTapListener* double_tap_listener_;
@@ -133,9 +134,9 @@ class GESTURE_DETECTION_EXPORT GestureDetector {
bool always_in_bigger_tap_region_;
bool two_finger_tap_allowed_for_gesture_;
- scoped_ptr<MotionEvent> current_down_event_;
- scoped_ptr<MotionEvent> previous_up_event_;
- scoped_ptr<MotionEvent> secondary_pointer_down_event_;
+ std::unique_ptr<MotionEvent> current_down_event_;
+ std::unique_ptr<MotionEvent> previous_up_event_;
+ std::unique_ptr<MotionEvent> secondary_pointer_down_event_;
// True when the user is still touching for the second tap (down, move, and
// up events). Can only be true if there is a double tap listener attached.
« no previous file with comments | « ui/events/event_utils.cc ('k') | ui/events/gesture_detection/gesture_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698