Move SelectionBound from ui/base/touch to ui/gfx to be used by cc

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"
 #include "base/metrics/user_metrics.h"
 
 namespace ui {
 namespace {
 
-gfx::Vector2dF ComputeLineOffsetFromBottom(const SelectionBound& bound) {
+gfx::Vector2dF ComputeLineOffsetFromBottom(const gfx::SelectionBound& bound) {
   gfx::Vector2dF line_offset =
       gfx::ScaleVector2d(bound.edge_top() - bound.edge_bottom(), 0.5f);
   // An offset of 8 DIPs is sufficient for most line sizes. For small lines,
   // using half the line height avoids synthesizing a point on a line above
   // (or below) the intended line.
   const gfx::Vector2dF kMaxLineOffset(8.f, 8.f);
   line_offset.SetToMin(kMaxLineOffset);
   line_offset.SetToMax(-kMaxLineOffset);
   return line_offset;
 }
 
-TouchHandleOrientation ToTouchHandleOrientation(SelectionBound::Type type) {
+TouchHandleOrientation ToTouchHandleOrientation(
+    gfx::SelectionBound::Type type) {
   switch (type) {
-    case SelectionBound::LEFT:
+    case gfx::SelectionBound::LEFT:
       return TouchHandleOrientation::LEFT;
-    case SelectionBound::RIGHT:
+    case gfx::SelectionBound::RIGHT:
       return TouchHandleOrientation::RIGHT;
-    case SelectionBound::CENTER:
+    case gfx::SelectionBound::CENTER:
       return TouchHandleOrientation::CENTER;
-    case SelectionBound::EMPTY:
+    case gfx::SelectionBound::EMPTY:
       return TouchHandleOrientation::UNDEFINED;
   }
   NOTREACHED() << "Invalid selection bound type: " << type;
   return TouchHandleOrientation::UNDEFINED;
 }
 
 }  // namespace
 
 TouchSelectionController::Config::Config()
     : max_tap_duration(base::TimeDelta::FromMilliseconds(300)),
@@ skipping 23 matching lines @@
       anchor_drag_to_selection_start_(false),
       longpress_drag_selector_(this),
       selection_handle_dragged_(false) {
   DCHECK(client_);
 }
 
 TouchSelectionController::~TouchSelectionController() {
 }
 
 void TouchSelectionController::OnSelectionBoundsChanged(
-    const SelectionBound& start,
-    const SelectionBound& end) {
+    const gfx::SelectionBound& start,
+    const gfx::SelectionBound& end) {
   if (!force_next_update_ && start == start_ && end_ == end)
     return;
 
   // Notify if selection bounds have just been established or dissolved.
-  if (start.type() != SelectionBound::EMPTY &&
-      start_.type() == SelectionBound::EMPTY) {
+  if (start.type() != gfx::SelectionBound::EMPTY &&
+      start_.type() == gfx::SelectionBound::EMPTY) {
     client_->OnSelectionEvent(SELECTION_ESTABLISHED);
-  } else if (start.type() == SelectionBound::EMPTY &&
-             start_.type() != SelectionBound::EMPTY) {
+  } else if (start.type() == gfx::SelectionBound::EMPTY &&
+             start_.type() != gfx::SelectionBound::EMPTY) {
     client_->OnSelectionEvent(SELECTION_DISSOLVED);
   }
 
   // Swap the Handles when the start and end selection points cross each other.
   if (active_status_ == SELECTION_ACTIVE) {
     if ((start_selection_handle_->IsActive() &&
          end_.edge_bottom() == start.edge_bottom()) ||
         (end_selection_handle_->IsActive() &&
          end.edge_bottom() == start_.edge_bottom())) {
       start_selection_handle_.swap(end_selection_handle_);
@@ skipping 518 matching lines @@
   end_selection_handle_->SetEnabled(false);
   active_status_ = INACTIVE;
   client_->OnSelectionEvent(SELECTION_HANDLES_CLEARED);
 }
 
 void TouchSelectionController::ForceNextUpdateIfInactive() {
   // Only force the update if the reported selection is non-empty but still
   // considered "inactive", i.e., it wasn't preceded by a user gesture or
   // the handles have since been explicitly hidden.
   if (active_status_ == INACTIVE &&
-      start_.type() != SelectionBound::EMPTY &&
-      end_.type() != SelectionBound::EMPTY) {
+      start_.type() != gfx::SelectionBound::EMPTY &&
+      end_.type() != gfx::SelectionBound::EMPTY) {
     force_next_update_ = true;
   }
 }
 
 void TouchSelectionController::UpdateHandleLayoutIfNecessary() {
   if (active_status_ == INSERTION_ACTIVE) {
     DCHECK(insertion_handle_);
     insertion_handle_->UpdateHandleLayout();
   } else if (active_status_ == SELECTION_ACTIVE) {
     DCHECK(start_selection_handle_);
@@ skipping 54 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