MacViews: tryjobs for toolkit_views=1

ui/views/controls/textfield/textfield.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/textfield.h"
 
 #include <string>
 
 #include "base/trace_event/trace_event.h"
 #include "ui/accessibility/ax_view_state.h"
@@ skipping 651 matching lines @@
   initiating_drag_ = false;
   UpdateSelectionClipboard();
   OnAfterUserAction();
 }
 
 bool Textfield::OnKeyPressed(const ui::KeyEvent& event) {
   // Since HandleKeyEvent() might destroy |this|, get a weak pointer and verify
   // 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;
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
       ui::GetTextEditKeyBindingsDelegate();
   std::vector<ui::TextEditCommandAuraLinux> commands;
   if (!handled && delegate && delegate->MatchEvent(event, &commands)) {
     const bool rtl = GetTextDirection() == base::i18n::RIGHT_TO_LEFT;
@@ skipping 10 matching lines @@
 
   const int command = GetCommandForKeyEvent(event, HasSelection());
   if (!handled && IsCommandIdEnabled(command)) {
     ExecuteCommand(command);
     handled = true;
   }
   return handled;
 }
 
 ui::TextInputClient* Textfield::GetTextInputClient() {
-  return read_only_ ? NULL : this;
+  return this;
 }
 
 void Textfield::OnGestureEvent(ui::GestureEvent* event) {
   switch (event->type()) {
     case ui::ET_GESTURE_TAP_DOWN:
       RequestFocus();
       ShowImeIfNeeded();
       event->SetHandled();
       break;
     case ui::ET_GESTURE_TAP:
@@ skipping 891 matching lines @@
 void Textfield::OnCandidateWindowHidden() {}
 
 bool Textfield::IsEditingCommandEnabled(int command_id) {
   return IsCommandIdEnabled(command_id);
 }
 
 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:
 
 gfx::RenderText* Textfield::GetRenderText() const {
   return model_->render_text();
 }
 
 base::string16 Textfield::GetSelectionClipboardText() const {
   base::string16 selection_clipboard_text;
   ui::Clipboard::GetForCurrentThread()->ReadText(
@@ skipping 244 matching lines @@
       const size_t length = selection_clipboard_text.length();
       range = gfx::Range(range.start() + length, range.end() + length);
     }
     model_->MoveCursorTo(gfx::SelectionModel(range, affinity));
     UpdateAfterChange(true, true);
     OnAfterUserAction();
   }
 }
 
 }  // namespace views