GTK: Show shortcuts in title bar context menu and tab context menu....

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 "app/l10n_util.h"
 #include "base/gfx/gtk_util.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
@@ skipping 107 matching lines @@
                           GtkAccelGroup* accel_group) {
   // We keep track of the last menu item in order to group radio items.
   GtkWidget* last_menu_item = NULL;
   for (; menu_data->type != MENU_END; ++menu_data) {
     GtkWidget* menu_item = NULL;
 
     std::string label;
     if (menu_data->label_argument) {
       label = l10n_util::GetStringFUTF8(
           menu_data->label_id,
-          WideToUTF16(l10n_util::GetString(menu_data->label_argument)));
+          l10n_util::GetStringUTF16(menu_data->label_argument));
     } else if (menu_data->label_id) {
       label = l10n_util::GetStringUTF8(menu_data->label_id);
     } else if (menu_data->type != MENU_SEPARATOR) {
       label = delegate_->GetLabel(menu_data->id);
       DCHECK(!label.empty());
     }
 
     label = GtkUtil::ConvertAcceleratorsFromWindowsStyle(label);
 
     switch (menu_data->type) {
@@ skipping 20 matching lines @@
 
     if (menu_data->submenu) {
       GtkWidget* submenu = gtk_menu_new();
       BuildMenuIn(submenu, menu_data->submenu, accel_group);
       gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item), submenu);
     } else if (menu_data->custom_submenu) {
       gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item),
                                 menu_data->custom_submenu->menu_.get());
     }
 
-    if (accel_group && menu_data->accel_key) {
+    if ((menu_data->only_show || accel_group) && 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",
                                  menu_data->only_show ? dummy_accel_group_ :
                                                         accel_group,
                                  menu_data->accel_key,
                                  GdkModifierType(menu_data->accel_modifiers),
                                  GTK_ACCEL_VISIBLE);
@@ skipping 163 matching lines @@
     gtk_widget_set_sensitive(
         widget, menu->delegate_->IsCommandEnabled(id));
 
     GtkWidget* submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget));
     if (submenu) {
       gtk_container_foreach(GTK_CONTAINER(submenu), &SetMenuItemInfo,
                             userdata);
     }
   }
 }