Move touch_selection_controller interface to ui/base.

ui/views/controls/textfield/native_textfield_views.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_
 #define UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_
 
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 #include "ui/base/events/event_constants.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/models/simple_menu_model.h"
+#include "ui/base/touch/touch_editing_controller.h"
 #include "ui/gfx/font.h"
 #include "ui/views/border.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/textfield/native_textfield_wrapper.h"
 #include "ui/views/controls/textfield/textfield_views_model.h"
 #include "ui/views/drag_controller.h"
-#include "ui/views/touchui/touch_selection_controller.h"
 #include "ui/views/view.h"
 
 namespace base {
 class Time;
 }
 
 namespace gfx {
 class Canvas;
 }
 
 namespace views {
 
 class FocusableBorder;
 class MenuModelAdapter;
 class MenuRunner;
 
 // A views/skia only implementation of NativeTextfieldWrapper.
 // No platform specific code is used.
 // Following features are not yet supported.
 // * BIDI/Complex script.
 // * Support surrogate pair, or maybe we should just use UTF32 internally.
 // * X selection (only if we want to support).
 // Once completed, this will replace Textfield, NativeTextfieldWin and
 // NativeTextfieldGtk.
-class VIEWS_EXPORT NativeTextfieldViews : public TouchSelectionClientView,
+class VIEWS_EXPORT NativeTextfieldViews : public View,
+                                          public ui::TouchSelectionClientView,
                                           public ContextMenuController,
                                           public DragController,
                                           public NativeTextfieldWrapper,
                                           public ui::TextInputClient,
                                           public TextfieldViewsModel::Delegate {
  public:
   // Interval over which the cursor/caret blinks.  This represents the full
   // cycle; the caret is shown for half of this time and hidden for the other
   // half.
   static const int kCursorBlinkCycleMs;
@@ skipping 14 matching lines @@
   virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE;
   virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE;
   virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE;
   virtual void OnDragDone() OVERRIDE;
   virtual bool OnKeyReleased(const ui::KeyEvent& event) OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual void OnFocus() OVERRIDE;
   virtual void OnBlur() OVERRIDE;
   virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE;
 
-  // TouchSelectionClientView overrides:
+  // ui::TouchEditingClientView overrides:
   virtual void SelectRect(const gfx::Point& start,
                           const gfx::Point& end) OVERRIDE;
+  virtual const gfx::Rect& GetBounds() OVERRIDE;
+  virtual gfx::NativeView GetNativeView() OVERRIDE;
+  virtual void ConvertPointToScreen(gfx::Point* point) OVERRIDE;
+  virtual void ConvertPointFromScreen(gfx::Point* point) OVERRIDE;
 
   // ContextMenuController overrides:
   virtual void ShowContextMenuForView(View* source,
                                       const gfx::Point& point) OVERRIDE;
 
   // Overridden from DragController:
   virtual void WriteDragDataForView(View* sender,
                                     const gfx::Point& press_pt,
                                     ui::OSExchangeData* data) OVERRIDE;
   virtual int GetDragOperationsForView(View* sender,
@@ skipping 201 matching lines @@
   // State variables used to track double and triple clicks.
   size_t aggregated_clicks_;
   base::TimeDelta last_click_time_;
   gfx::Point last_click_location_;
 
   // Context menu and its content list for the textfield.
   scoped_ptr<ui::SimpleMenuModel> context_menu_contents_;
   scoped_ptr<views::MenuModelAdapter> context_menu_delegate_;
   scoped_ptr<views::MenuRunner> context_menu_runner_;
 
-  scoped_ptr<TouchSelectionController> touch_selection_controller_;
+  scoped_ptr<ui::TouchSelectionController> touch_selection_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeTextfieldViews);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_