Chromium Code Reviews| 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..d3a3c2f193ff3ad01fb838995ab6c36ec621aa12 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,26 @@ 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) { |
| + 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; |