Reland: Move TouchSelectionController from content to ui

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 CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCH_SELECTION_CONTROLLER_H_
-#define CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCH_SELECTION_CONTROLLER_H_
+#ifndef UI_TOUCH_SELECTION_TOUCH_SELECTION_CONTROLLER_H_
+#define UI_TOUCH_SELECTION_TOUCH_SELECTION_CONTROLLER_H_
 
-#include "cc/output/viewport_selection_bound.h"
-#include "content/browser/renderer_host/input/selection_event_type.h"
-#include "content/browser/renderer_host/input/touch_handle.h"
-#include "content/common/content_export.h"
+#include "ui/base/touch/selection_bound.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/rect_f.h"
-
-namespace blink {
-class WebInputEvent;
-}
+#include "ui/touch_selection/selection_event_type.h"
+#include "ui/touch_selection/touch_handle.h"

[mfomitchev, 2014/12/01 21:36:24]

We only need to import selection_bound.h, not all off touch_handle.h?

[mohsen, 2014/12/02 05:17:03]

We're using a lot from touch_handle.h (e.g. subclassing TouchHandleClient,
TouchHandleOrientation, TouchHandle::AnimationStyle).

+#include "ui/touch_selection/ui_touch_selection_export.h"
 
 namespace ui {
+

[mfomitchev, 2014/12/01 21:36:24]

I think the convention is no blank line in spots like this.

[mohsen, 2014/12/02 05:17:03]

Done.

 class MotionEvent;
-}
-
-namespace content {
 
 // Interface through which |TouchSelectionController| issues selection-related
 // commands, notifications and requests.
-class CONTENT_EXPORT TouchSelectionControllerClient {
+class UI_TOUCH_SELECTION_EXPORT TouchSelectionControllerClient {
  public:
   virtual ~TouchSelectionControllerClient() {}
 
   virtual bool SupportsAnimation() const = 0;
   virtual void SetNeedsAnimate() = 0;
   virtual void MoveCaret(const gfx::PointF& position) = 0;
   virtual void MoveRangeSelectionExtent(const gfx::PointF& extent) = 0;
   virtual void SelectBetweenCoordinates(const gfx::PointF& base,
                                         const gfx::PointF& extent) = 0;
   virtual void OnSelectionEvent(SelectionEventType event,
                                 const gfx::PointF& position) = 0;
   virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() = 0;
 };
 
 // Controller for manipulating text selection via touch input.
-class CONTENT_EXPORT TouchSelectionController : public TouchHandleClient {
+class UI_TOUCH_SELECTION_EXPORT TouchSelectionController
+    : public TouchHandleClient {
  public:
   TouchSelectionController(TouchSelectionControllerClient* client,
                            base::TimeDelta tap_timeout,
                            float tap_slop);
   ~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 cc::ViewportSelectionBound& start,
-                                const cc::ViewportSelectionBound& end);
+  void OnSelectionBoundsChanged(const SelectionBound& start,
+                                const SelectionBound& end);
 
   // Allows touch-dragging of the handle.
   // Returns true iff the event was consumed, in which case the caller should
   // cease further handling of the event.
-  bool WillHandleTouchEvent(const ui::MotionEvent& event);
+  bool WillHandleTouchEvent(const MotionEvent& event);
 
   // To be called before forwarding a tap event. This allows automatically
   // showing the insertion handle from subsequent bounds changes.
   void OnTapEvent();
 
   // To be called before forwarding a longpress event. This allows automatically
   // showing the selection or insertion handles from subsequent bounds changes.
   void OnLongPressEvent();
 
   // Allow showing the selection handles from the most recent selection bounds
@@ skipping 50 matching lines @@
   bool GetStartVisible() const;
   bool GetEndVisible() const;
   TouchHandle::AnimationStyle GetAnimationStyle(bool was_active) const;
 
   TouchSelectionControllerClient* const client_;
   const base::TimeDelta tap_timeout_;
   const float tap_slop_;
 
   InputEventType response_pending_input_event_;
 
-  cc::ViewportSelectionBound start_;
-  cc::ViewportSelectionBound end_;
+  SelectionBound start_;
+  SelectionBound end_;
   TouchHandleOrientation start_orientation_;
   TouchHandleOrientation end_orientation_;
 
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchSelectionController);
 };
 
-}  // namespace content
+}  // namespace ui
 
-#endif  // CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCH_SELECTION_CONTROLLER_H_
+#endif  // UI_TOUCH_SELECTION_TOUCH_SELECTION_CONTROLLER_H_