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

ui/views/controls/textfield/textfield.cc

 // Copyright (c) 2012 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/views/controls/textfield/textfield.h"
 
 #include <string>
 #include <utility>
 
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/default_style.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/drag_utils.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/base/touch/selection_bound.h"
 #include "ui/base/ui_base_switches_util.h"
 #include "ui/compositor/canvas_painter.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/insets.h"
+#include "ui/gfx/selection_bound.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/focusable_border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/drag_utils.h"
 #include "ui/views/metrics.h"
@@ skipping 1111 matching lines @@
 
   OnBeforeUserAction();
   SelectSelectionModel(selection);
   OnAfterUserAction();
 }
 
 void Textfield::MoveCaretTo(const gfx::Point& point) {
   SelectRect(point, point);
 }
 
-void Textfield::GetSelectionEndPoints(ui::SelectionBound* anchor,
-                                      ui::SelectionBound* focus) {
+void Textfield::GetSelectionEndPoints(gfx::SelectionBound* anchor,
+                                      gfx::SelectionBound* focus) {
   gfx::RenderText* render_text = GetRenderText();
   const gfx::SelectionModel& sel = render_text->selection_model();
   gfx::SelectionModel start_sel =
       render_text->GetSelectionModelForSelectionStart();
   gfx::Rect r1 = render_text->GetCursorBounds(start_sel, true);
   gfx::Rect r2 = render_text->GetCursorBounds(sel, true);
 
   anchor->SetEdge(gfx::PointF(r1.origin()), gfx::PointF(r1.bottom_left()));
   focus->SetEdge(gfx::PointF(r2.origin()), gfx::PointF(r2.bottom_left()));
 
   // Determine the SelectionBound's type for focus and anchor.
   // TODO(mfomitchev): Ideally we should have different logical directions for
   // start and end to support proper handle direction for mixed LTR/RTL text.
   const bool ltr = GetTextDirection() != base::i18n::RIGHT_TO_LEFT;
   size_t anchor_position_index = sel.selection().start();
   size_t focus_position_index = sel.selection().end();
 
   if (anchor_position_index == focus_position_index) {
-    anchor->set_type(ui::SelectionBound::CENTER);
-    focus->set_type(ui::SelectionBound::CENTER);
+    anchor->set_type(gfx::SelectionBound::CENTER);
+    focus->set_type(gfx::SelectionBound::CENTER);
   } else if ((ltr && anchor_position_index < focus_position_index) ||
              (!ltr && anchor_position_index > focus_position_index)) {
-    anchor->set_type(ui::SelectionBound::LEFT);
-    focus->set_type(ui::SelectionBound::RIGHT);
+    anchor->set_type(gfx::SelectionBound::LEFT);
+    focus->set_type(gfx::SelectionBound::RIGHT);
   } else {
-    anchor->set_type(ui::SelectionBound::RIGHT);
-    focus->set_type(ui::SelectionBound::LEFT);
+    anchor->set_type(gfx::SelectionBound::RIGHT);
+    focus->set_type(gfx::SelectionBound::LEFT);
   }
 }
 
 gfx::Rect Textfield::GetBounds() {
   return GetLocalBounds();
 }
 
 gfx::NativeView Textfield::GetNativeView() const {
   return GetWidget()->GetNativeView();
 }
@@ skipping 728 matching lines @@
     RequestFocus();
   model_->MoveCursorTo(mouse);
   if (!selection_clipboard_text.empty()) {
     model_->InsertText(selection_clipboard_text);
     UpdateAfterChange(true, true);
   }
   OnAfterUserAction();
 }
 
 }  // namespace views