| Index: views/controls/textfield/native_textfield_views.cc
|
| diff --git a/views/controls/textfield/native_textfield_views.cc b/views/controls/textfield/native_textfield_views.cc
|
| index 07725fffba6e7513e1f4288c3917505fb99ddf15..107c95b78a0581cdf35a150b0337e968357587b1 100644
|
| --- a/views/controls/textfield/native_textfield_views.cc
|
| +++ b/views/controls/textfield/native_textfield_views.cc
|
| @@ -555,7 +555,7 @@ void NativeTextfieldViews::HandleBlur() {
|
| touch_selection_controller_->ClientViewLostFocus();
|
| }
|
|
|
| -TextInputClient* NativeTextfieldViews::GetTextInputClient() {
|
| +ui::TextInputClient* NativeTextfieldViews::GetTextInputClient() {
|
| return textfield_->read_only() ? NULL : this;
|
| }
|
|
|
| @@ -652,7 +652,7 @@ void NativeTextfieldViews::OnBoundsChanged(const gfx::Rect& previous_bounds) {
|
| }
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
| -// NativeTextfieldViews, TextInputClient implementation, private:
|
| +// NativeTextfieldViews, ui::TextInputClient implementation, private:
|
|
|
| void NativeTextfieldViews::SetCompositionText(
|
| const ui::CompositionText& composition) {
|
| @@ -813,10 +813,6 @@ bool NativeTextfieldViews::ChangeTextDirectionAndLayoutAlignment(
|
| return false;
|
| }
|
|
|
| -View* NativeTextfieldViews::GetOwnerViewOfTextInputClient() {
|
| - return textfield_;
|
| -}
|
| -
|
| void NativeTextfieldViews::OnCompositionTextConfirmedOrCleared() {
|
| if (skip_input_method_cancel_composition_)
|
| return;
|
|
|