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

Unified Diff: ui/events/gestures/blink/web_gesture_curve_impl.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
Index: ui/events/gestures/blink/web_gesture_curve_impl.h
diff --git a/ui/events/gestures/blink/web_gesture_curve_impl.h b/ui/events/gestures/blink/web_gesture_curve_impl.h
index 27eb0b4d01a2ec44a119ffb49e03d0afd623ba40..f11562f329e0c1eb78f6e397dbf46d74b3b4527c 100644
--- a/ui/events/gestures/blink/web_gesture_curve_impl.h
+++ b/ui/events/gestures/blink/web_gesture_curve_impl.h
@@ -7,9 +7,10 @@
#include <stdint.h>
+#include <memory>
+
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "third_party/WebKit/public/platform/WebGestureCurve.h"
#include "ui/gfx/geometry/vector2d_f.h"
@@ -22,12 +23,12 @@ class GestureCurve;
class WebGestureCurveImpl : public NON_EXPORTED_BASE(blink::WebGestureCurve) {
public:
- static scoped_ptr<blink::WebGestureCurve> CreateFromDefaultPlatformCurve(
+ static std::unique_ptr<blink::WebGestureCurve> CreateFromDefaultPlatformCurve(
const gfx::Vector2dF& initial_velocity,
const gfx::Vector2dF& initial_offset,
bool on_main_thread);
- static scoped_ptr<blink::WebGestureCurve> CreateFromUICurveForTesting(
- scoped_ptr<GestureCurve> curve,
+ static std::unique_ptr<blink::WebGestureCurve> CreateFromUICurveForTesting(
+ std::unique_ptr<GestureCurve> curve,
const gfx::Vector2dF& initial_offset);
~WebGestureCurveImpl() override;
@@ -43,11 +44,11 @@ class WebGestureCurveImpl : public NON_EXPORTED_BASE(blink::WebGestureCurve) {
TEST
};
- WebGestureCurveImpl(scoped_ptr<GestureCurve> curve,
+ WebGestureCurveImpl(std::unique_ptr<GestureCurve> curve,
const gfx::Vector2dF& initial_offset,
ThreadType animating_thread_type);
- scoped_ptr<GestureCurve> curve_;
+ std::unique_ptr<GestureCurve> curve_;
gfx::Vector2dF last_offset_;
« no previous file with comments | « ui/events/gesture_detection/velocity_tracker_unittest.cc ('k') | ui/events/gestures/blink/web_gesture_curve_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698