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

Unified Diff: ui/events/blink/input_handler_proxy.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/blink/blink_event_util.cc ('k') | ui/events/blink/input_handler_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/blink/input_handler_proxy.h
diff --git a/ui/events/blink/input_handler_proxy.h b/ui/events/blink/input_handler_proxy.h
index 4ef107fba76ae2c5d0b5a2fe231121eb5286590a..e047cdfe10a4dbacdf5ba5d492504a905d2ae172 100644
--- a/ui/events/blink/input_handler_proxy.h
+++ b/ui/events/blink/input_handler_proxy.h
@@ -5,9 +5,10 @@
#ifndef UI_EVENTS_BLINK_INPUT_HANDLER_PROXY_H_
#define UI_EVENTS_BLINK_INPUT_HANDLER_PROXY_H_
+#include <memory>
+
#include "base/containers/hash_tables.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "cc/input/input_handler.h"
#include "third_party/WebKit/public/platform/WebGestureCurve.h"
#include "third_party/WebKit/public/platform/WebGestureCurveTarget.h"
@@ -151,7 +152,7 @@ class InputHandlerProxy
const blink::WebGestureEvent& gesture_event,
const cc::InputHandlerScrollResult& scroll_result);
- scoped_ptr<blink::WebGestureCurve> fling_curve_;
+ std::unique_ptr<blink::WebGestureCurve> fling_curve_;
// Parameters for the active fling animation, stored in case we need to
// transfer it out later.
blink::WebActiveWheelFlingParameters fling_parameters_;
@@ -198,7 +199,8 @@ class InputHandlerProxy
gfx::Vector2dF current_fling_velocity_;
// Used to animate rubber-band over-scroll effect on Mac.
- scoped_ptr<InputScrollElasticityController> scroll_elasticity_controller_;
+ std::unique_ptr<InputScrollElasticityController>
+ scroll_elasticity_controller_;
bool smooth_scroll_enabled_;
bool uma_latency_reporting_enabled_;
« no previous file with comments | « ui/events/blink/blink_event_util.cc ('k') | ui/events/blink/input_handler_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698