Consolidate OnKeyEvent and InputMethod code.

views/widget/widget_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 "views/widget/widget_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <X11/extensions/shape.h>
 #include <X11/Xatom.h>
@@ skipping 597 matching lines @@
   g_signal_connect(widget_, "map",
                    G_CALLBACK(&OnMapThunk), this);
   g_signal_connect(widget_, "hide",
                    G_CALLBACK(&OnHideThunk), this);
 
   // Views/FocusManager (re)sets the focus to the root window,
   // so we need to connect signal handlers to the gtk window.
   // See views::Views::Focus and views::FocusManager::ClearNativeFocus
   // for more details.
   g_signal_connect(widget_, "key_press_event",
-                   G_CALLBACK(&OnKeyEventThunk), this);
+                   G_CALLBACK(&OnEventKeyThunk), this);
   g_signal_connect(widget_, "key_release_event",
-                   G_CALLBACK(&OnKeyEventThunk), this);
+                   G_CALLBACK(&OnEventKeyThunk), this);
 
   // Drag and drop.
   gtk_drag_dest_set(window_contents_, static_cast<GtkDestDefaults>(0),
                     NULL, 0, GDK_ACTION_COPY);
   g_signal_connect(window_contents_, "drag_motion",
                    G_CALLBACK(&OnDragMotionThunk), this);
   g_signal_connect(window_contents_, "drag_data_received",
                    G_CALLBACK(&OnDragDataReceivedThunk), this);
   g_signal_connect(window_contents_, "drag_drop",
                    G_CALLBACK(&OnDragDropThunk), this);
@@ skipping 653 matching lines @@
 
   if (type_ == TYPE_CHILD)
     return false;
 
   // Only top-level Widget should have an InputMethod instance.
   if (input_method_.get())
     input_method_->OnBlur();
   return false;
 }
 
-gboolean WidgetGtk::OnKeyEvent(GtkWidget* widget, GdkEventKey* event) {
+gboolean WidgetGtk::OnEventKey(GtkWidget* widget, GdkEventKey* event) {
   KeyEvent key(reinterpret_cast<NativeEvent>(event));
   if (input_method_.get())
     input_method_->DispatchKeyEvent(key);
   else
     DispatchKeyEventPostIME(key);
 
   // Returns true to prevent GtkWindow's default key event handler.
   return true;
 }
 
@@ skipping 73 matching lines @@
 }
 
 void WidgetGtk::DispatchKeyEventPostIME(const KeyEvent& key) {
   // Always reset |should_handle_menu_key_release_| unless we are handling a
   // VKEY_MENU key release event. It ensures that VKEY_MENU accelerator can only
   // be activated when handling a VKEY_MENU key release event which is preceded
   // by an unhandled VKEY_MENU key press event. See also HandleKeyboardEvent().
   if (key.key_code() != ui::VKEY_MENU || key.type() != ui::ET_KEY_RELEASED)
     should_handle_menu_key_release_ = false;
 
-  bool handled = false;
-
-  // Dispatch the key event to View hierarchy first.
-  handled = GetRootView()->ProcessKeyEvent(key);
+  // Send the key event to View hierarchy first.
+  bool handled = delegate_->OnKeyEvent(key);
 
   if (key.key_code() == ui::VKEY_PROCESSKEY || handled)
     return;
 
   // Dispatch the key event to native GtkWidget hierarchy.
   // To prevent GtkWindow from handling the key event as a keybinding, we need
   // to bypass GtkWindow's default key event handler and dispatch the event
   // here.
   GdkEventKey* event = reinterpret_cast<GdkEventKey*>(key.native_event());
   if (!handled && event && GTK_IS_WINDOW(widget_))
@@ skipping 345 matching lines @@
 
   NativeWidget* native_widget = GetNativeWidgetForNativeView(native_view);
   if (native_widget)
     children->insert(native_widget);
   gtk_container_foreach(GTK_CONTAINER(native_view),
                         EnumerateChildWidgetsForNativeWidgets,
                         reinterpret_cast<gpointer>(children));
 }
 
 }  // namespace views