ui/events/gesture_detection/velocity_tracker.h - Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/events/gesture_detection/velocity_tracker.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/gesture_detection/touch_disposition_gesture_filter_unittest.cc ('k') | ui/events/gesture_detection/velocity_tracker_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/events/gesture_detection/velocity_tracker.h

diff --git a/ui/events/gesture_detection/velocity_tracker.h b/ui/events/gesture_detection/velocity_tracker.h

index 41265585fb7719a75df4c49f59f8b8d609e23cfc..5195a1fa993c57f4a24a6c800896ce153fda11b2 100644

--- a/ui/events/gesture_detection/velocity_tracker.h

+++ b/ui/events/gesture_detection/velocity_tracker.h

@@ -7,8 +7,9 @@

#include <stdint.h>

+#include <memory>

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "base/time/time.h"

#include "ui/events/gesture_detection/bitset_32.h"

@@ -144,7 +145,7 @@ class VelocityTracker {

base::TimeTicks last_event_time_;

BitSet32 current_pointer_id_bits_;

int32_t active_pointer_id_;

- scoped_ptr<VelocityTrackerStrategy> strategy_;

+ std::unique_ptr<VelocityTrackerStrategy> strategy_;

DISALLOW_COPY_AND_ASSIGN(VelocityTracker);

};