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

Unified Diff: ui/touch_selection/touch_handle.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/surface/transport_dib_win.cc ('k') | ui/touch_selection/touch_handle_drawable_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/touch_selection/touch_handle.h
diff --git a/ui/touch_selection/touch_handle.h b/ui/touch_selection/touch_handle.h
index 37a7c5a9a5a71fac2cd36b8086e434b615032d39..5d581e5003471919080505d08f6b14b1f5ba5761 100644
--- a/ui/touch_selection/touch_handle.h
+++ b/ui/touch_selection/touch_handle.h
@@ -5,9 +5,10 @@
#ifndef UI_TOUCH_SELECTION_TOUCH_HANDLE_H_
#define UI_TOUCH_SELECTION_TOUCH_HANDLE_H_
+#include <memory>
+
#include "base/logging.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
#include "ui/events/gesture_detection/motion_event.h"
#include "ui/gfx/geometry/point_f.h"
@@ -60,7 +61,7 @@ class UI_TOUCH_SELECTION_EXPORT TouchHandleClient
~TouchHandleClient() override {}
virtual void OnHandleTapped(const TouchHandle& handle) = 0;
virtual void SetNeedsAnimate() = 0;
- virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() = 0;
+ virtual std::unique_ptr<TouchHandleDrawable> CreateDrawable() = 0;
virtual base::TimeDelta GetMaxTapDuration() const = 0;
virtual bool IsAdaptiveHandleOrientationEnabled() const = 0;
};
@@ -131,7 +132,7 @@ class UI_TOUCH_SELECTION_EXPORT TouchHandle : public TouchSelectionDraggable {
void SetAlpha(float alpha);
void SetUpdateLayoutRequired();
- scoped_ptr<TouchHandleDrawable> drawable_;
+ std::unique_ptr<TouchHandleDrawable> drawable_;
TouchHandleClient* const client_;
« no previous file with comments | « ui/surface/transport_dib_win.cc ('k') | ui/touch_selection/touch_handle_drawable_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698