Refactor TouchSelectionDraggableClient APIs

ui/touch_selection/longpress_drag_selector.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/touch_selection/longpress_drag_selector.h"
 
 #include "base/auto_reset.h"
 #include "ui/events/gesture_detection/motion_event.h"
 
 namespace ui {
@@ skipping 35 matching lines @@
     default:
       return false;
   }
 
   if (state_ != DRAG_PENDING && state_ != DRAGGING)
     return false;
 
   gfx::PointF position(event.GetX(), event.GetY());
   if (state_ == DRAGGING) {
     gfx::PointF drag_position = position + longpress_drag_selection_offset_;
-    client_->OnDragUpdate(*this, drag_position);
+    client_->OnDragEvent(HANDLE_DRAG_UPDATE, *this, drag_position);
     return true;
   }
 
   // We can't use |touch_down_position_| as the offset anchor, as
   // showing the selection UI may have shifted the motion coordinates.
   if (!has_longpress_drag_start_anchor_) {
     has_longpress_drag_start_anchor_ = true;
     longpress_drag_start_anchor_ = position;
     return true;
   }
@@ skipping 28 matching lines @@
       extend_selection_start = start_dot_product > end_dot_product;
     } else {
       // If we're already moving away from both endpoints, pick the closest.
       extend_selection_start =
           start_delta.LengthSquared() < end_delta.LengthSquared();
     }
   }
 
   gfx::PointF extent = extend_selection_start ? selection_start : selection_end;
   longpress_drag_selection_offset_ = extent - position;
-  client_->OnDragBegin(*this, extent);
+  client_->OnDragEvent(HANDLE_DRAG_BEGIN, *this, extent);
   SetState(DRAGGING);
   return true;
 }
 
 bool LongPressDragSelector::IsActive() const {
   return state_ != INACTIVE && state_ != LONGPRESS_PENDING;
 }
 
 void LongPressDragSelector::OnLongPressEvent(base::TimeTicks event_time,
                                              const gfx::PointF& position) {
@@ skipping 22 matching lines @@
 void LongPressDragSelector::SetState(SelectionState state) {
   if (state_ == state)
     return;
 
   const bool was_dragging = state_ == DRAGGING;
   const bool was_active = IsActive();
   state_ = state;
 
   // TODO(jdduke): Add UMA for tracking relative longpress drag frequency.
   if (was_dragging)
-    client_->OnDragEnd(*this);
+    client_->OnDragEvent(HANDLE_DRAG_END, *this, gfx::PointF());
 
   if (was_active != IsActive())
     client_->OnLongPressDragActiveStateChanged();
 }
 
 }  // namespace ui