Move touch_selection_controller interface to ui/base.

ui/views/controls/textfield/native_textfield_views.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/native_textfield_views.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 52 matching lines @@
     : textfield_(parent),
       ALLOW_THIS_IN_INITIALIZER_LIST(model_(new TextfieldViewsModel(this))),
       text_border_(new FocusableBorder()),
       is_cursor_visible_(false),
       is_drop_cursor_visible_(false),
       skip_input_method_cancel_composition_(false),
       initiating_drag_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(cursor_timer_(this)),
       aggregated_clicks_(0),
       ALLOW_THIS_IN_INITIALIZER_LIST(touch_selection_controller_(
-          TouchSelectionController::create(this))) {
+          ui::TouchSelectionController::create(this))) {
   set_border(text_border_);
 
 #if defined(OS_CHROMEOS)
   GetRenderText()->SetFontList(gfx::FontList(l10n_util::GetStringUTF8(
       IDS_UI_FONT_FAMILY_CROS)));
 #else
   GetRenderText()->SetFont(textfield_->font());
 #endif
 
   UpdateColorsFromTheme(GetNativeTheme());
@@ skipping 81 matching lines @@
     case ui::ET_GESTURE_SCROLL_UPDATE:
       OnBeforeUserAction();
       if (MoveCursorTo(event->location(), true))
         SchedulePaint();
       OnAfterUserAction();
       event->SetHandled();
       return;
     default:
       break;
   }
-  TouchSelectionClientView::OnGestureEvent(event);
+  View::OnGestureEvent(event);
 }
 
 bool NativeTextfieldViews::OnKeyPressed(const ui::KeyEvent& event) {
   // OnKeyPressed/OnKeyReleased/OnFocus/OnBlur will never be invoked on
   // NativeTextfieldViews as it will never gain focus.
   NOTREACHED();
   return false;
 }
 
 bool NativeTextfieldViews::OnKeyReleased(const ui::KeyEvent& event) {
@@ skipping 118 matching lines @@
       ui::Range(start_caret.caret_pos(), end_caret.caret_pos()),
       end_caret.caret_affinity());
 
   OnBeforeUserAction();
   model_->SelectSelectionModel(selection);
   OnCaretBoundsChanged();
   SchedulePaint();
   OnAfterUserAction();
 }
 
+const gfx::Rect& NativeTextfieldViews::GetBounds() {
+  return bounds();
+}
+
+gfx::NativeView NativeTextfieldViews::GetNativeView() {
+  return GetWidget()->GetNativeView();
+}
+
+void NativeTextfieldViews::ConvertPointToScreen(gfx::Point* point) {
+  View::ConvertPointToScreen(this, point);
+}
+
+void NativeTextfieldViews::ConvertPointFromScreen(gfx::Point* point) {
+  if (!GetWidget())
+    return;
+  gfx::Rect r = GetWidget()->GetClientAreaBoundsInScreen();
+  point->SetPoint(point->x() - r.x(), point->y() - r.y());
+  View::ConvertPointFromWidget(this, point);

[sadrul, 2013/02/13 00:49:17]

There is View::ConvertPointFromScreen

[varunjain, 2013/02/13 00:52:12]

Done.

+}
+
 gfx::NativeCursor NativeTextfieldViews::GetCursor(const ui::MouseEvent& event) {
   bool in_selection = GetRenderText()->IsPointInSelection(event.location());
   bool drag_event = event.type() == ui::ET_MOUSE_DRAGGED;
   bool text_cursor = !initiating_drag_ && (drag_event || !in_selection);
 #if defined(USE_AURA)
   return text_cursor ? ui::kCursorIBeam : ui::kCursorNull;
 #elif defined(OS_WIN)
   static HCURSOR ibeam = LoadCursor(NULL, IDC_IBEAM);
   static HCURSOR arrow = LoadCursor(NULL, IDC_ARROW);
   return text_cursor ? ibeam : arrow;
@@ skipping 971 matching lines @@
   // Filter out all control characters, including tab and new line characters,
   // and all characters with Alt modifier. But we need to allow characters with
   // AltGr modifier.
   // On Windows AltGr is represented by Alt+Ctrl, and on Linux it's a different
   // flag that we don't care about.
   return ((ch >= 0x20 && ch < 0x7F) || ch > 0x9F) &&
       (flags & ~(ui::EF_SHIFT_DOWN | ui::EF_CAPS_LOCK_DOWN)) != ui::EF_ALT_DOWN;
 }
 
 }  // namespace views