Refactor TouchSelectionDraggableClient APIs

ui/touch_selection/touch_selection_controller.h

 // 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.
 
 #ifndef UI_TOUCH_SELECTION_TOUCH_SELECTION_CONTROLLER_H_
 #define UI_TOUCH_SELECTION_TOUCH_SELECTION_CONTROLLER_H_
 
 #include "base/time/time.h"
 #include "ui/base/touch/selection_bound.h"
 #include "ui/gfx/geometry/point_f.h"
@@ skipping 128 matching lines @@
   const SelectionBound& end() const { return end_; }
 
   ActiveStatus active_status() const { return active_status_; }
 
  private:
   friend class TouchSelectionControllerTestApi;
 
   enum InputEventType { TAP, REPEATED_TAP, LONG_PRESS, INPUT_EVENT_TYPE_NONE };
 
   // TouchHandleClient implementation.
-  void OnDragBegin(const TouchSelectionDraggable& draggable,
-                   const gfx::PointF& drag_position) override;
-  void OnDragUpdate(const TouchSelectionDraggable& draggable,
-                    const gfx::PointF& drag_position) override;
-  void OnDragEnd(const TouchSelectionDraggable& draggable) override;
+  void OnDragEvent(const TouchHandleDragEvent event,
+                   const TouchSelectionDraggable& draggable,
+                   const gfx::PointF& start_position) override;
   bool IsWithinTapSlop(const gfx::Vector2dF& delta) const override;
   void OnHandleTapped(const TouchHandle& handle) override;
   void SetNeedsAnimate() override;
   scoped_ptr<TouchHandleDrawable> CreateDrawable() override;
   base::TimeDelta GetMaxTapDuration() const override;
   bool IsAdaptiveHandleOrientationEnabled() const override;
 
+  void HandleDragBegin(const TouchSelectionDraggable& draggable,
+                       const gfx::PointF& drag_position);
+  void HandleDragUpdate(const TouchSelectionDraggable& draggable,
+                        const gfx::PointF& drag_position);
+  void HandleDragEnd(const TouchSelectionDraggable& draggable);
+
   // LongPressDragSelectorClient implementation.
   void OnLongPressDragActiveStateChanged() override;
   gfx::PointF GetSelectionStart() const override;
   gfx::PointF GetSelectionEnd() const override;
 
   void ShowInsertionHandleAutomatically();
   void ShowSelectionHandlesAutomatically();
   bool WillHandleTapOrLongPress(const gfx::PointF& location);
 
   void OnInsertionChanged();
@@ skipping 63 matching lines @@
   // Whether a selection handle was dragged during the current 'selection
   // session' - i.e. since the current selection has been activated.
   bool selection_handle_dragged_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchSelectionController);
 };
 
 }  // namespace ui
 
 #endif  // UI_TOUCH_SELECTION_TOUCH_SELECTION_CONTROLLER_H_