Replace Textfield::Keystroke with views::KeyEvent

views/controls/textfield/native_textfield_gtk.cc

 // Copyright (c) 2010 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 339 matching lines @@
     GtkWidget* widget,
     GdkEventKey* event,
     NativeTextfieldGtk* textfield) {
   return textfield->OnKeyPressEvent(event);
 }
 
 gboolean NativeTextfieldGtk::OnKeyPressEvent(GdkEventKey* event) {
   Textfield::Controller* controller = textfield_->GetController();
   if (controller) {
     KeyEvent key_event(event);
-    Textfield::Keystroke ks(&key_event);
-    return controller->HandleKeystroke(textfield_, ks);
+    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);
   gboolean handled = false;
 
   Textfield::Controller* controller = textfield_->GetController();
   if (controller) {
     KeyEvent views_key_event(key_event);
-    Textfield::Keystroke ks(&views_key_event);
-    handled = controller->HandleKeystroke(textfield_, ks);
+    handled = controller->HandleKeyEvent(textfield_, views_key_event);
   }
 
   WidgetGtk* widget = static_cast<WidgetGtk*>(GetWidget());
   if (!handled && widget)
     handled = widget->HandleKeyboardEvent(key_event);
 
   return handled;
 }
 
 // static
@@ skipping 44 matching lines @@
                      G_CALLBACK(OnChangedHandler), this);
   }
   g_signal_connect_after(widget, "key-press-event",
                          G_CALLBACK(OnKeyPressEventHandler), this);
   // In order to properly trigger Accelerators bound to VKEY_RETURN, we need to
   // send an event when the widget gets the activate signal.
   g_signal_connect(widget, "activate", G_CALLBACK(OnActivateHandler), this);
 }
 
 }  // namespace views