| Index: ui/touch_selection/touch_handle.h
|
| diff --git a/ui/touch_selection/touch_handle.h b/ui/touch_selection/touch_handle.h
|
| index f46a07fd761e2ee34b5dde89632cc42364e0746f..9a7418cf1b1d0182ec656f353ab657436465f81f 100644
|
| --- a/ui/touch_selection/touch_handle.h
|
| +++ b/ui/touch_selection/touch_handle.h
|
| @@ -13,6 +13,7 @@
|
| #include "ui/gfx/geometry/rect_f.h"
|
| #include "ui/gfx/geometry/vector2d_f.h"
|
| #include "ui/touch_selection/touch_handle_orientation.h"
|
| +#include "ui/touch_selection/touch_selection_draggable.h"
|
| #include "ui/touch_selection/ui_touch_selection_export.h"
|
|
|
| namespace ui {
|
| @@ -32,13 +33,10 @@ class UI_TOUCH_SELECTION_EXPORT TouchHandleDrawable {
|
|
|
| // Interface through which |TouchHandle| communicates handle manipulation and
|
| // requests concrete drawable instances.
|
| -class UI_TOUCH_SELECTION_EXPORT TouchHandleClient {
|
| +class UI_TOUCH_SELECTION_EXPORT TouchHandleClient
|
| + : public TouchSelectionDraggableClient {
|
| public:
|
| - virtual ~TouchHandleClient() {}
|
| - virtual void OnHandleDragBegin(const TouchHandle& handle) = 0;
|
| - virtual void OnHandleDragUpdate(const TouchHandle& handle,
|
| - const gfx::PointF& new_position) = 0;
|
| - virtual void OnHandleDragEnd(const TouchHandle& handle) = 0;
|
| + ~TouchHandleClient() override {}
|
| virtual void OnHandleTapped(const TouchHandle& handle) = 0;
|
| virtual void SetNeedsAnimate() = 0;
|
| virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() = 0;
|
| @@ -48,11 +46,11 @@ class UI_TOUCH_SELECTION_EXPORT TouchHandleClient {
|
|
|
| // Responsible for displaying a selection or insertion handle for text
|
| // interaction.
|
| -class UI_TOUCH_SELECTION_EXPORT TouchHandle {
|
| +class UI_TOUCH_SELECTION_EXPORT TouchHandle : public TouchSelectionDraggable {
|
| public:
|
| // The drawable will be enabled but invisible until otherwise specified.
|
| TouchHandle(TouchHandleClient* client, TouchHandleOrientation orientation);
|
| - ~TouchHandle();
|
| + ~TouchHandle() override;
|
|
|
| // Sets whether the handle is active, allowing resource cleanup if necessary.
|
| // If false, active animations or touch drag sequences will be cancelled.
|
| @@ -109,7 +107,7 @@ class UI_TOUCH_SELECTION_EXPORT TouchHandle {
|
| TouchHandleOrientation deferred_orientation_;
|
|
|
| gfx::PointF touch_down_position_;
|
| - gfx::Vector2dF touch_to_focus_offset_;
|
| + gfx::Vector2dF touch_drag_offset_;
|
| base::TimeTicks touch_down_time_;
|
|
|
| // Note that when a fade animation is active, |is_visible_| and |position_|
|
|
|