Integrate the new input method API for Views into Chromium.

views/controls/textfield/native_textfield_gtk.cc

 // Copyright (c) 2011 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 <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include "views/controls/textfield/native_textfield_gtk.h"
 
 #include "base/logging.h"
@@ skipping 358 matching lines @@
 bool NativeTextfieldGtk::HandleKeyReleased(const views::KeyEvent& e) {
   return false;
 }
 
 void NativeTextfieldGtk::HandleFocus() {
 }
 
 void NativeTextfieldGtk::HandleBlur() {
 }
 
+TextInputClient* NativeTextfieldGtk::GetTextInputClient() {
+  return NULL;
+}
+
 // static
 gboolean NativeTextfieldGtk::OnKeyPressEventHandler(
     GtkWidget* widget,
     GdkEventKey* event,
     NativeTextfieldGtk* textfield) {
   return textfield->OnKeyPressEvent(event);
 }
 
 gboolean NativeTextfieldGtk::OnKeyPressEvent(GdkEventKey* event) {
   TextfieldController* controller = textfield_->GetController();
   if (controller) {
     KeyEvent key_event(reinterpret_cast<GdkEvent*>(event));
     return controller->HandleKeyEvent(textfield_, key_event);
   }
   return false;
 }
 
 // static
 gboolean NativeTextfieldGtk::OnActivateHandler(
     GtkWidget* widget,
     NativeTextfieldGtk* textfield) {
   return textfield->OnActivate();
 }
 
 gboolean NativeTextfieldGtk::OnActivate() {
   GdkEvent* event = gtk_get_current_event();
   if (!event || event->type != GDK_KEY_PRESS)
     return false;
 
-  GdkEventKey* key_event = reinterpret_cast<GdkEventKey*>(event);
+  KeyEvent views_key_event(event);
   gboolean handled = false;
 
   TextfieldController* controller = textfield_->GetController();
-  if (controller) {
-    KeyEvent views_key_event(event);
+  if (controller)
     handled = controller->HandleKeyEvent(textfield_, views_key_event);
-  }
 
   WidgetGtk* widget = static_cast<WidgetGtk*>(GetWidget());
   if (!handled && widget)
-    handled = widget->HandleKeyboardEvent(key_event);
+    handled = widget->HandleKeyboardEvent(views_key_event);
 
   return handled;
 }
 
 // static
 gboolean NativeTextfieldGtk::OnChangedHandler(
     GtkWidget* widget,
     NativeTextfieldGtk* textfield) {
   return textfield->OnChanged();
 }
 
 gboolean NativeTextfieldGtk::OnChanged() {
   textfield_->SyncText();
-  TextfieldController* controller = textfield_->GetController();
-  if (controller)
-    controller->ContentsChanged(textfield_, GetText());
   textfield_->GetWidget()->NotifyAccessibilityEvent(
       textfield_, ui::AccessibilityTypes::EVENT_TEXT_CHANGED, true);
   return false;
 }
 
 // static
 gboolean NativeTextfieldGtk::OnMoveCursorHandler(
     GtkWidget* widget,
     GtkMovementStep step,
     gint count,
@@ skipping 75 matching lines @@
 // static
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
   if (NativeTextfieldViews::IsTextfieldViewsEnabled()) {
     return new NativeTextfieldViews(field);
   }
   return new NativeTextfieldGtk(field);
 }
 
 }  // namespace views