Implement accelerators in the gtk port.

chrome/browser/gtk/menu_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/menu_gtk.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/common/l10n_util.h"
 #include "skia/include/SkBitmap.h"
@@ skipping 55 matching lines @@
 
   // Assume ownership of pixbuf.
   g_object_ref_sink(pixbuf);
   bitmap->unlockPixels();
   return pixbuf;
 }
 
 }  // namespace
 
 MenuGtk::MenuGtk(MenuGtk::Delegate* delegate,
-                 const MenuCreateMaterial* menu_data)
+                 const MenuCreateMaterial* menu_data,
+                 GtkAccelGroup* accel_group)
     : delegate_(delegate),
+      accel_group_(accel_group),
       menu_(gtk_menu_new()) {
   g_object_ref_sink(menu_);
   BuildMenuIn(menu_, menu_data);
 }
 
 MenuGtk::MenuGtk(MenuGtk::Delegate* delegate)
     : delegate_(delegate),
       menu_(gtk_menu_new()) {
   g_object_ref_sink(menu_);
   BuildMenuFromDelegate();
@@ skipping 51 matching lines @@
         menu_item = gtk_menu_item_new_with_mnemonic(WideToUTF8(label).c_str());
         break;
     }
 
     if (menu_data->submenu) {
       GtkWidget* submenu = gtk_menu_new();
       BuildMenuIn(submenu, menu_data->submenu);
       gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item), submenu);
     }
 
+    if (menu_data->accel_key) {
+      // If we ever want to let the user do any key remaping, we'll need to
+      // change the following so we make a gtk_accel_map which keeps the actual
+      // keys.
+      gtk_widget_add_accelerator(menu_item,
+                                 "activate",
+                                 accel_group_,
+                                 menu_data->accel_key,
+                                 GdkModifierType(menu_data->accel_modifiers),
+                                 GTK_ACCEL_VISIBLE);
+    }
+
     g_object_set_data(G_OBJECT(menu_item), "menu-data",
                       const_cast<MenuCreateMaterial*>(menu_data));
 
     g_signal_connect(G_OBJECT(menu_item), "activate",
                      G_CALLBACK(OnMenuItemActivated), this);
 
     gtk_widget_show(menu_item);
     gtk_menu_append(menu, menu_item);
   }
 }
@@ skipping 109 matching lines @@
           widget, menu->delegate_->IsCommandEnabled(data->id));
 
       GtkWidget* submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget));
       if (submenu) {
         gtk_container_foreach(GTK_CONTAINER(submenu), &MenuGtk::SetMenuItemInfo,
                               raw_menu);
       }
     }
   }
 }