Fix typeahead for popup menu with attributes

content/browser/renderer_host/webmenurunner_mac.mm

 // Copyright 2013 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 "content/browser/renderer_host/webmenurunner_mac.h"
 
 #include "base/strings/sys_string_conversions.h"
 
 @interface WebMenuRunner (PrivateAPI)
 
@@ skipping 64 matching lines @@
     [attrs setObject:directionArray forKey:NSWritingDirectionAttributeName];
   }
 
   [attrs setObject:[NSFont menuFontOfSize:fontSize_]
             forKey:NSFontAttributeName];
 
   base::scoped_nsobject<NSAttributedString> attrTitle(
       [[NSAttributedString alloc] initWithString:title attributes:attrs]);
   [menuItem setAttributedTitle:attrTitle];
 
+  // We set the title as well as the attributed title here. The attributed title
+  // will be displayed in the menu, but typeahead will use the non-attributed
+  // string that doesn't contain any leading or trailing whitespace. This is
+  // what Apple uses in WebKit as well:
+  // http://trac.webkit.org/browser/trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm#L90
+  NSCharacterSet* whitespaceSet = [NSCharacterSet whitespaceCharacterSet];
+  [menuItem setTitle:[title stringByTrimmingCharactersInSet:whitespaceSet]];
+
   [menuItem setTag:[menu_ numberOfItems] - 1];
 }
 
 // Reflects the result of the user's interaction with the popup menu. If NO, the
 // menu was dismissed without the user choosing an item, which can happen if the
 // user clicked outside the menu region or hit the escape key. If YES, the user
 // selected an item from the menu.
 - (BOOL)menuItemWasChosen {
   return menuItemWasChosen_;
 }
@@ skipping 43 matching lines @@
 
   if ([self menuItemWasChosen])
     index_ = [cell indexOfSelectedItem];
 }
 
 - (int)indexOfSelectedItem {
   return index_;
 }
 
 @end  // WebMenuRunner