Make cmd-{/} shortcut keys work on any keyboard layouts (including non-US ones) on Mac.

BUG=25946
TEST=GlobalKeyboardShortcuts.ShortcutsToWindowCommand
TEST=Go to a Web page, open several tabs and press Cmd-{/}.  Make sure the browser tab switches to next or prev.  This should work on any keyboards (including ones with non-US layout).

Review URL: http://codereview.chromium.org/503080

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35525 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 2 deletions

diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm
index b01a844..a7e5bf1 100644
--- a/chrome/browser/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/cocoa/browser_window_cocoa.mm
@@ -452,14 +452,15 @@ int BrowserWindowCocoa::GetCommandId(const NativeWebKeyboardEvent& event) {
   const bool cntrlKey = (modifiers & NSControlKeyMask) != 0;
   const bool optKey = (modifiers & NSAlternateKeyMask) != 0;
   const int keyCode = [event.os_event keyCode];
+  const unichar keyChar = KeyCharacterForEvent(event.os_event);
 
   int cmdNum = CommandForWindowKeyboardShortcut(
-      cmdKey, shiftKey, cntrlKey, optKey, keyCode);
+      cmdKey, shiftKey, cntrlKey, optKey, keyCode, keyChar);
   if (cmdNum != -1)
     return cmdNum;
 
   cmdNum = CommandForBrowserKeyboardShortcut(
-      cmdKey, shiftKey, cntrlKey, optKey, keyCode);
+      cmdKey, shiftKey, cntrlKey, optKey, keyCode, keyChar);
   if (cmdNum != -1)
     return cmdNum;
 
@@ -478,6 +479,7 @@ bool BrowserWindowCocoa::HandleKeyboardEventInternal(NSEvent* event) {
     // "previous tab", it takes precedence over the built-in "history back"
     // binding. Other than that, the |redispatchEvent| call would take care of
     // invoking the original menu item shortcut as well.
+
     if ([[NSApp mainMenu] performKeyEquivalent:event])
       return true;