Refactor TouchSelectionDraggableClient APIs

ui/touch_selection/touch_handle.cc

 // Copyright 2014 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/touch_handle.h"
 
 #include <cmath>
 
 namespace ui {
 
@@ skipping 177 matching lines @@
       BeginDrag();
     } break;
 
     case MotionEvent::ACTION_MOVE: {
       gfx::PointF touch_move_position(event.GetX(), event.GetY());
       is_drag_within_tap_region_ &=
           client_->IsWithinTapSlop(touch_down_position_ - touch_move_position);
 
       // Note that we signal drag update even if we're inside the tap region,
       // as there are cases where characters are narrower than the slop length.
-      client_->OnDragUpdate(*this, touch_move_position + touch_drag_offset_);
+      client_->OnDragEvent(HANDLE_DRAG_UPDATE, *this,
+                           touch_move_position + touch_drag_offset_);
     } break;
 
     case MotionEvent::ACTION_UP: {
       if (is_drag_within_tap_region_ &&
           (event.GetEventTime() - touch_down_time_) <
               client_->GetMaxTapDuration()) {
         client_->OnHandleTapped(*this);
       }
 
       EndDrag();
@@ skipping 121 matching lines @@
   return focus - gfx::Vector2dF(focal_offset_x, focal_offset_y);
 }
 
 void TouchHandle::BeginDrag() {
   DCHECK(enabled_);
   if (is_dragging_)
     return;
   EndFade();
   is_dragging_ = true;
   is_drag_within_tap_region_ = true;
-  client_->OnDragBegin(*this, focus_bottom());
+  client_->OnDragEvent(HANDLE_DRAG_BEGIN, *this, focus_bottom());
 }
 
 void TouchHandle::EndDrag() {
   DCHECK(enabled_);
   if (!is_dragging_)
     return;
 
   is_dragging_ = false;
   is_drag_within_tap_region_ = false;
-  client_->OnDragEnd(*this);
+  client_->OnDragEvent(HANDLE_DRAG_BEGIN, *this, focus_bottom());
 
   if (deferred_orientation_ != TouchHandleOrientation::UNDEFINED) {
     TouchHandleOrientation deferred_orientation = deferred_orientation_;
     deferred_orientation_ = TouchHandleOrientation::UNDEFINED;
     SetOrientation(deferred_orientation);
     // Handle layout may be deferred while the handle is dragged.
     SetUpdateLayoutRequired();
     UpdateHandleLayout();
   }
 
@@ skipping 38 matching lines @@
   drawable_->SetAlpha(alpha);
 }
 
 void TouchHandle::SetUpdateLayoutRequired() {
   // TODO(AviD): Make the layout call explicit to the caller by adding this in
   // TouchHandleClient.
   is_handle_layout_update_required_ = true;
 }
 
 }  // namespace ui