| Index: ui/views/controls/textfield/textfield.cc
|
| diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc
|
| index 6e0dc0d19b369e28d75105b131b203ce7e6aac69..ccb433cf421947069cdeb3774f8421c7685a8c5f 100644
|
| --- a/ui/views/controls/textfield/textfield.cc
|
| +++ b/ui/views/controls/textfield/textfield.cc
|
| @@ -669,7 +669,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event) {
|
| // it isn't null before proceeding.
|
| base::WeakPtr<Textfield> textfield(weak_ptr_factory_.GetWeakPtr());
|
|
|
| - bool handled = controller_ && controller_->HandleKeyEvent(this, event);
|
| + bool handled = HandleAsKeyEventOnly(event);
|
|
|
| if (!textfield)
|
| return handled;
|
| @@ -700,7 +700,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event) {
|
| }
|
|
|
| ui::TextInputClient* Textfield::GetTextInputClient() {
|
| - return read_only_ ? NULL : this;
|
| + return this;
|
| }
|
|
|
| void Textfield::OnGestureEvent(ui::GestureEvent* event) {
|
| @@ -1612,6 +1612,10 @@ void Textfield::ExecuteEditingCommand(int command_id) {
|
| ExecuteCommand(command_id);
|
| }
|
|
|
| +bool Textfield::HandleAsKeyEventOnly(const ui::KeyEvent& key_event) {
|
| + return controller_ && controller_->HandleKeyEvent(this, key_event);
|
| +}
|
| +
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // Textfield, protected:
|
|
|
|
|