Mac. Make wrench menu controller ignore embedded ampersand (Windows accelerator key marker) in bo...

chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
 
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 89 matching lines @@
     default:
       NOTREACHED();
       break;
   }
   [self adjustPositioning];
   [menu insertItem:customItem.get() atIndex:index];
 }
 
 - (NSMenu*)bookmarkSubMenu {
   NSString* title = l10n_util::GetNSString(IDS_BOOKMARKS_MENU);
-  return [[[self menu] itemWithTitle:title] submenu];
+  // Strip windows accelerator mark.
+  NSString* processedTitle = [title stringByReplacingOccurrencesOfString:@"&"
+                                                              withString:@""];

[Avi (use Gerrit), 2011/05/27 21:08:09]

NAK. This is what l10n_util::GetNSStringWithFixup is for.

[mafv, 2011/05/27 21:22:28]

Done.

+  return [[[self menu] itemWithTitle:processedTitle] submenu];
 }
 
 - (void)updateBookmarkSubMenu {
   BookmarkMenuBridge* bridge = [[NSApp delegate] bookmarkMenuBridge];
   NSMenu* bookmarkMenu = [self bookmarkSubMenu];
   if (bridge && bookmarkMenu)
     bridge->UpdateSubMenu(bookmarkMenu);
 }
 
 - (void)menuWillOpen:(NSMenu*)menu {
@@ skipping 95 matching lines @@
   parentFrame.size.width += delta;
   parentFrame.origin.x -= delta;
   [[editCut_ superview] setFrame:parentFrame];
 }
 
 - (NSButton*)zoomDisplay {
   return zoomDisplay_;
 }
 
 @end  // @implementation WrenchMenuController