Improves key event handing code of BrowserWindowGtk....

chrome/browser/gtk/browser_window_gtk.cc

 // Copyright (c) 2009 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 "chrome/browser/gtk/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <X11/XF86keysym.h>
 
 #include <string>
@@ skipping 419 matching lines @@
   // The current tab might not have a render view if it crashed.
   if (!current_tab_contents || !current_tab_contents->GetContentNativeView() ||
       !gtk_widget_is_focus(current_tab_contents->GetContentNativeView())) {
     if (HandleCustomAccelerator(event->keyval,
         GdkModifierType(event->state), browser) ||
         PreHandleAccelerator(event->keyval,
         GdkModifierType(event->state), browser)) {
       return TRUE;
     }
 
-    return gtk_window_propagate_key_event(window, event);
+    // Propagate the key event to child widget first, so we don't override their
+    // accelerators.
+    if (!gtk_window_propagate_key_event(window, event)) {
+      if (!gtk_window_activate_key(window, event)) {
+        gtk_bindings_activate_event(GTK_OBJECT(window), event);
+      }
+    }
   } else {
     bool rv = gtk_window_propagate_key_event(window, event);
     DCHECK(rv);
-    return TRUE;
   }
+
+  // Prevents the default handler from handling this event.
+  return TRUE;
 }
 
 GdkCursorType GdkWindowEdgeToGdkCursorType(GdkWindowEdge edge) {
   switch (edge) {
     case GDK_WINDOW_EDGE_NORTH_WEST:
       return GDK_TOP_LEFT_CORNER;
     case GDK_WINDOW_EDGE_NORTH:
       return GDK_TOP_SIDE;
     case GDK_WINDOW_EDGE_NORTH_EAST:
       return GDK_TOP_RIGHT_CORNER;
@@ skipping 70 matching lines @@
 
 BrowserWindowGtk::~BrowserWindowGtk() {
   browser_->tabstrip_model()->RemoveObserver(this);
 
   if (frame_cursor_) {
     gdk_cursor_unref(frame_cursor_);
     frame_cursor_ = NULL;
   }
 }
 
-void BrowserWindowGtk::HandleAccelerator(guint keyval,
-                                         GdkModifierType modifier) {
-  if (!HandleCustomAccelerator(keyval, modifier, browser_.get())) {
-    // Pass the accelerator on to GTK.
-    gtk_accel_groups_activate(G_OBJECT(window_), keyval, modifier);
+void BrowserWindowGtk::HandleAccelerator(GdkEventKey* event) {
+  // Handles a key event as an accelerator in following sequence:
+  // 1. Our special key accelerators, such as ctrl-tab, etc.
+  // 2. Gtk mnemonics and accelerators.
+  // 3. Gtk binding set.
+  // This sequence matches the default key press handler of GtkWindow.
+  //
+  // It's not necessary to care about the keyboard layout issue, as
+  // gtk_window_activate_key() and gtk_bindings_activate_event() take care of it
+  // automatically.
+  if (!HandleCustomAccelerator(event->keyval, GdkModifierType(event->state),
+                               browser_.get())) {
+    if (!gtk_window_activate_key(window_, event)) {
+      gtk_bindings_activate_event(GTK_OBJECT(window_), event);
+    }
   }
 }
 
 gboolean BrowserWindowGtk::OnCustomFrameExpose(GtkWidget* widget,
                                                GdkEventExpose* event,
                                                BrowserWindowGtk* window) {
   ThemeProvider* theme_provider =
       window->browser()->profile()->GetThemeProvider();
 
   // Draw the default background.
@@ skipping 1492 matching lines @@
   // special-case the ones where the custom frame should be used.  These names
   // are taken from the WMs' source code.
   return (wm_name == "Blackbox" ||
           wm_name == "compiz" ||
           wm_name == "e16" ||  // Enlightenment DR16
           wm_name == "KWin" ||
           wm_name == "Metacity" ||
           wm_name == "Openbox" ||
           wm_name == "Xfwm4");
 }