Refactor TouchSelectionDraggableClient APIs

ui/touch_selection/touch_selection_controller.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_selection_controller.h"
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 
@@ skipping 314 matching lines @@
 }
 
 const gfx::PointF& TouchSelectionController::GetStartPosition() const {
   return start_.edge_bottom();
 }
 
 const gfx::PointF& TouchSelectionController::GetEndPosition() const {
   return end_.edge_bottom();
 }
 
-void TouchSelectionController::OnDragBegin(
+void TouchSelectionController::OnDragEvent(
+    const TouchHandleDragEvent event,
+    const TouchSelectionDraggable& draggable,
+    const gfx::PointF& position) {
+  switch (event) {
+    case HANDLE_DRAG_BEGIN:
+      HandleDragBegin(draggable, position);
+      break;
+    case HANDLE_DRAG_UPDATE:
+      HandleDragUpdate(draggable, position);
+      break;
+    case HANDLE_DRAG_END:
+      HandleDragEnd(draggable);
+    default:
+      NOTREACHED() << "Invalid handle drag event";
+  }
+}
+
+bool TouchSelectionController::IsWithinTapSlop(
+    const gfx::Vector2dF& delta) const {
+  return delta.LengthSquared() <
+         (static_cast<double>(config_.tap_slop) * config_.tap_slop);
+}
+
+void TouchSelectionController::OnHandleTapped(const TouchHandle& handle) {
+  if (insertion_handle_ && &handle == insertion_handle_.get())
+    client_->OnSelectionEvent(INSERTION_HANDLE_TAPPED);
+}
+
+void TouchSelectionController::SetNeedsAnimate() {
+  client_->SetNeedsAnimate();
+}
+
+scoped_ptr<TouchHandleDrawable> TouchSelectionController::CreateDrawable() {
+  return client_->CreateDrawable();
+}
+
+base::TimeDelta TouchSelectionController::GetMaxTapDuration() const {
+  return config_.max_tap_duration;
+}
+
+bool TouchSelectionController::IsAdaptiveHandleOrientationEnabled() const {
+  return config_.enable_adaptive_handle_orientation;
+}
+
+void TouchSelectionController::HandleDragBegin(
     const TouchSelectionDraggable& draggable,
     const gfx::PointF& drag_position) {
   if (&draggable == insertion_handle_.get()) {
     DCHECK_EQ(active_status_, INSERTION_ACTIVE);
     client_->OnSelectionEvent(INSERTION_HANDLE_DRAG_STARTED);
     anchor_drag_to_selection_start_ = true;
     return;
   }
 
   DCHECK_EQ(active_status_, SELECTION_ACTIVE);
@@ skipping 15 matching lines @@
     std::swap(base, extent);
 
   selection_handle_dragged_ = true;
 
   // When moving the handle we want to move only the extent point. Before doing
   // so we must make sure that the base point is set correctly.
   client_->SelectBetweenCoordinates(base, extent);
   client_->OnSelectionEvent(SELECTION_HANDLE_DRAG_STARTED);
 }
 
-void TouchSelectionController::OnDragUpdate(
+void TouchSelectionController::HandleDragUpdate(
     const TouchSelectionDraggable& draggable,
     const gfx::PointF& drag_position) {
   // As the position corresponds to the bottom left point of the selection
   // bound, offset it to some reasonable point on the current line of text.
   gfx::Vector2dF line_offset = anchor_drag_to_selection_start_
                                    ? GetStartLineOffset()
                                    : GetEndLineOffset();
   gfx::PointF line_position = drag_position + line_offset;
   if (&draggable == insertion_handle_.get())
     client_->MoveCaret(line_position);
   else
     client_->MoveRangeSelectionExtent(line_position);
 }
 
-void TouchSelectionController::OnDragEnd(
+void TouchSelectionController::HandleDragEnd(
     const TouchSelectionDraggable& draggable) {
   if (&draggable == insertion_handle_.get())
     client_->OnSelectionEvent(INSERTION_HANDLE_DRAG_STOPPED);
   else
     client_->OnSelectionEvent(SELECTION_HANDLE_DRAG_STOPPED);
 }
 
-bool TouchSelectionController::IsWithinTapSlop(
-    const gfx::Vector2dF& delta) const {
-  return delta.LengthSquared() <
-         (static_cast<double>(config_.tap_slop) * config_.tap_slop);
-}
-
-void TouchSelectionController::OnHandleTapped(const TouchHandle& handle) {
-  if (insertion_handle_ && &handle == insertion_handle_.get())
-    client_->OnSelectionEvent(INSERTION_HANDLE_TAPPED);
-}
-
-void TouchSelectionController::SetNeedsAnimate() {
-  client_->SetNeedsAnimate();
-}
-
-scoped_ptr<TouchHandleDrawable> TouchSelectionController::CreateDrawable() {
-  return client_->CreateDrawable();
-}
-
-base::TimeDelta TouchSelectionController::GetMaxTapDuration() const {
-  return config_.max_tap_duration;
-}
-
-bool TouchSelectionController::IsAdaptiveHandleOrientationEnabled() const {
-  return config_.enable_adaptive_handle_orientation;
-}
-
 void TouchSelectionController::OnLongPressDragActiveStateChanged() {
   // The handles should remain hidden for the duration of a longpress drag,
   // including the time between a longpress and the start of drag motion.
   RefreshHandleVisibility();
 }
 
 gfx::PointF TouchSelectionController::GetSelectionStart() const {
   return GetStartPosition();
 }
 
@@ skipping 234 matching lines @@
     base::TimeDelta duration = base::TimeTicks::Now() - selection_start_time_;
     UMA_HISTOGRAM_CUSTOM_TIMES("Event.TouchSelection.WasDraggedDuration",
                                duration,
                                base::TimeDelta::FromMilliseconds(500),
                                base::TimeDelta::FromSeconds(60),
                                60);
   }
 }
 
 }  // namespace ui