Add Aura handles to be used in unified touch selection

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 "ui/base/touch/selection_bound.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/rect_f.h"
@@ skipping 18 matching lines @@
   virtual void SelectBetweenCoordinates(const gfx::PointF& base,
                                         const gfx::PointF& extent) = 0;
   virtual void OnSelectionEvent(SelectionEventType event) = 0;
   virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() = 0;
 };
 
 // Controller for manipulating text selection via touch input.
 class UI_TOUCH_SELECTION_EXPORT TouchSelectionController
     : public TouchHandleClient {
  public:
+  enum ActiveStatus {

[jdduke (slow), 2015/05/07 20:38:15]

Do we need to expose this publicly? 

[mohsen, 2015/05/07 21:21:55]

In a few places for Aura implementation, we'll need to know if touch selection
is active or not. That's why active_status() method (and this enum) is public.
For example, in the main patch (http://crrev.com/698253004), see line 2183 of
render_widget_host_view_aura.cc and line 167 of
touch_selection_controller_client_aura.cc. (they're still using
is_insertion_active()/is_selection_active() which after this patch would change
to active_status())

+    INACTIVE,
+    INSERTION_ACTIVE,
+    SELECTION_ACTIVE,
+  };
+
   TouchSelectionController(TouchSelectionControllerClient* client,
                            base::TimeDelta tap_timeout,
                            float tap_slop,
                            bool show_on_tap_for_empty_editable);
   ~TouchSelectionController() override;
 
   // To be called when the selection bounds have changed.
   // Note that such updates will trigger handle updates only if preceded
   // by an appropriate call to allow automatic showing.
   void OnSelectionBoundsChanged(const SelectionBound& start,
@@ skipping 22 matching lines @@
 
   // Override the handle visibility according to |hidden|.
   void SetTemporarilyHidden(bool hidden);
 
   // To be called when the editability of the focused region changes.
   void OnSelectionEditable(bool editable);
 
   // To be called when the contents of the focused region changes.
   void OnSelectionEmpty(bool empty);
 
+  // To be called when native view moves around.
+  void OnNativeViewMoved();
+
   // Ticks an active animation, as requested to the client by |SetNeedsAnimate|.
   // Returns true if an animation is active and requires further ticking.
   bool Animate(base::TimeTicks animate_time);
 
   // Returns the rect between the two active selection bounds. If just one of
   // the bounds is visible, the rect is simply the (one-dimensional) rect of
   // that bound. If no selection is active, an empty rect will be returned.
   gfx::RectF GetRectBetweenBounds() const;
 
   // Returns the visible rect of specified touch handle. For an active insertion
   // these values will be identical.
   gfx::RectF GetStartHandleRect() const;
   gfx::RectF GetEndHandleRect() const;
 
   // Returns the focal point of the start and end bounds, as defined by
   // their bottom coordinate.
   const gfx::PointF& GetStartPosition() const;
   const gfx::PointF& GetEndPosition() const;
 
+  const SelectionBound& start() const { return start_; }
+  const SelectionBound& end() const { return end_; }
+
+  ActiveStatus active_status() const { return active_status_; }
+
  private:
   enum InputEventType { TAP, LONG_PRESS, INPUT_EVENT_TYPE_NONE };
 
   // TouchHandleClient implementation.
   void OnHandleDragBegin(const TouchHandle& handle) override;
   void OnHandleDragUpdate(const TouchHandle& handle,
                           const gfx::PointF& new_position) override;
   void OnHandleDragEnd(const TouchHandle& handle) override;
   void OnHandleTapped(const TouchHandle& handle) override;
   void SetNeedsAnimate() override;
@@ skipping 29 matching lines @@
   // editable text.
   bool show_on_tap_for_empty_editable_;
 
   InputEventType response_pending_input_event_;
 
   SelectionBound start_;
   SelectionBound end_;
   TouchHandleOrientation start_orientation_;
   TouchHandleOrientation end_orientation_;
 
+  ActiveStatus active_status_;
+
   scoped_ptr<TouchHandle> insertion_handle_;
-  bool is_insertion_active_;
   bool activate_insertion_automatically_;
 
   scoped_ptr<TouchHandle> start_selection_handle_;
   scoped_ptr<TouchHandle> end_selection_handle_;
-  bool is_selection_active_;
   bool activate_selection_automatically_;
 
   bool selection_empty_;
   bool selection_editable_;
 
   bool temporarily_hidden_;
 
   base::TimeTicks selection_start_time_;
   // 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_