Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Unified Diff: ui/views/controls/textfield/native_textfield_views.cc

Issue 12224133: Move touch_selection_controller interface to ui/base. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/textfield/native_textfield_views.h ('k') | ui/views/touchui/touch_selection_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/textfield/native_textfield_views.cc
diff --git a/ui/views/controls/textfield/native_textfield_views.cc b/ui/views/controls/textfield/native_textfield_views.cc
index 8318671d454fd77df1aa233e7526a81877753472..d9c4348754f8b357c5ec7b3a8bd52d274f2ae49c 100644
--- a/ui/views/controls/textfield/native_textfield_views.cc
+++ b/ui/views/controls/textfield/native_textfield_views.cc
@@ -70,7 +70,7 @@ NativeTextfieldViews::NativeTextfieldViews(Textfield* parent)
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)
@@ -172,7 +172,7 @@ void NativeTextfieldViews::OnGestureEvent(ui::GestureEvent* event) {
default:
break;
}
- TouchSelectionClientView::OnGestureEvent(event);
+ View::OnGestureEvent(event);
}
bool NativeTextfieldViews::OnKeyPressed(const ui::KeyEvent& event) {
@@ -311,6 +311,22 @@ void NativeTextfieldViews::SelectRect(const gfx::Point& start,
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) {
+ View::ConvertPointFromScreen(this, point);
+}
+
gfx::NativeCursor NativeTextfieldViews::GetCursor(const ui::MouseEvent& event) {
bool in_selection = GetRenderText()->IsPointInSelection(event.location());
bool drag_event = event.type() == ui::ET_MOUSE_DRAGGED;
« no previous file with comments | « ui/views/controls/textfield/native_textfield_views.h ('k') | ui/views/touchui/touch_selection_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698