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

Unified Diff: ui/touch_selection/touch_selection_controller.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/touch_selection/touch_handle_unittest.cc ('k') | ui/touch_selection/touch_selection_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/touch_selection/touch_selection_controller.h
diff --git a/ui/touch_selection/touch_selection_controller.h b/ui/touch_selection/touch_selection_controller.h
index 56f4eb4f2533339bd253a6135634ca7f7ff84aff..12cbf0b5deb7b8b271f74c9ae1b77d6d802e8a25 100644
--- a/ui/touch_selection/touch_selection_controller.h
+++ b/ui/touch_selection/touch_selection_controller.h
@@ -33,7 +33,7 @@ class UI_TOUCH_SELECTION_EXPORT TouchSelectionControllerClient {
virtual void SelectBetweenCoordinates(const gfx::PointF& base,
const gfx::PointF& extent) = 0;
virtual void OnSelectionEvent(SelectionEventType event) = 0;
- virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() = 0;
+ virtual std::unique_ptr<TouchHandleDrawable> CreateDrawable() = 0;
};
// Controller for manipulating text selection via touch input.
@@ -161,7 +161,7 @@ class UI_TOUCH_SELECTION_EXPORT TouchSelectionController
bool IsWithinTapSlop(const gfx::Vector2dF& delta) const override;
void OnHandleTapped(const TouchHandle& handle) override;
void SetNeedsAnimate() override;
- scoped_ptr<TouchHandleDrawable> CreateDrawable() override;
+ std::unique_ptr<TouchHandleDrawable> CreateDrawable() override;
base::TimeDelta GetMaxTapDuration() const override;
bool IsAdaptiveHandleOrientationEnabled() const override;
@@ -214,11 +214,11 @@ class UI_TOUCH_SELECTION_EXPORT TouchSelectionController
ActiveStatus active_status_;
- scoped_ptr<TouchHandle> insertion_handle_;
+ std::unique_ptr<TouchHandle> insertion_handle_;
bool activate_insertion_automatically_;
- scoped_ptr<TouchHandle> start_selection_handle_;
- scoped_ptr<TouchHandle> end_selection_handle_;
+ std::unique_ptr<TouchHandle> start_selection_handle_;
+ std::unique_ptr<TouchHandle> end_selection_handle_;
bool activate_selection_automatically_;
bool selection_empty_;
« no previous file with comments | « ui/touch_selection/touch_handle_unittest.cc ('k') | ui/touch_selection/touch_selection_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698