Properly display mnemonics in some gtk menus where they were not being escape...

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/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
@@ skipping 24 matching lines @@
   if (dummy_accel_group_)
     g_object_unref(dummy_accel_group_);
 }
 
 void MenuGtk::ConnectSignalHandlers() {
   g_signal_connect(menu_.get(), "hide", G_CALLBACK(OnMenuHidden), this);
 }
 
 void MenuGtk::AppendMenuItemWithLabel(int command_id,
                                       const std::string& label) {
-  GtkWidget* menu_item = gtk_menu_item_new_with_mnemonic(label.c_str());
+  std::string converted_label = ConvertAcceleratorsFromWindowsStyle(label);
+  GtkWidget* menu_item =
+      gtk_menu_item_new_with_mnemonic(converted_label.c_str());
   AddMenuItemWithId(menu_item, command_id);
 }
 
 void MenuGtk::AppendMenuItemWithIcon(int command_id,
                                      const std::string& label,
                                      const SkBitmap& icon) {
   GtkWidget* menu_item = BuildMenuItemWithImage(label, icon);
   AddMenuItemWithId(menu_item, command_id);
 }
 
 void MenuGtk::AppendCheckMenuItemWithLabel(int command_id,
                                            const std::string& label) {
-  GtkWidget* menu_item = gtk_check_menu_item_new_with_mnemonic(label.c_str());
+  std::string converted_label = ConvertAcceleratorsFromWindowsStyle(label);
+  GtkWidget* menu_item =
+      gtk_check_menu_item_new_with_mnemonic(converted_label.c_str());
   AddMenuItemWithId(menu_item, command_id);
 }
 
 void MenuGtk::AppendSeparator() {
   GtkWidget* menu_item = gtk_separator_menu_item_new();
   gtk_widget_show(menu_item);
   gtk_menu_shell_append(GTK_MENU_SHELL(menu_.get()), menu_item);
 }
 
 void MenuGtk::Popup(GtkWidget* widget, GdkEvent* event) {
@@ skipping 116 matching lines @@
                      G_CALLBACK(OnMenuItemActivated), this);
 
     gtk_widget_show(menu_item);
     gtk_menu_append(menu, menu_item);
     last_menu_item = menu_item;
   }
 }
 
 GtkWidget* MenuGtk::BuildMenuItemWithImage(const std::string& label,
                                            const SkBitmap& icon) {
-  GtkWidget* menu_item = gtk_image_menu_item_new_with_mnemonic(label.c_str());
+  std::string converted_label = ConvertAcceleratorsFromWindowsStyle(label);
+  GtkWidget* menu_item =
+      gtk_image_menu_item_new_with_mnemonic(converted_label.c_str());
 
   GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&icon);
   gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item),
                                 gtk_image_new_from_pixbuf(pixbuf));
   g_object_unref(pixbuf);
 
   return menu_item;
 }
 
 void MenuGtk::BuildMenuFromDelegate() {
@@ skipping 145 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);
     }
   }
 }