Index: chrome/browser/cocoa/chrome_event_processing_window.mm |
diff --git a/chrome/browser/cocoa/chrome_event_processing_window.mm b/chrome/browser/cocoa/chrome_event_processing_window.mm |
index b5c43e0496fa21a1a8b91d279aa6c99cc840b24f..36fea38c81e89a3c8f622daef908f57e04659875 100644 |
--- a/chrome/browser/cocoa/chrome_event_processing_window.mm |
+++ b/chrome/browser/cocoa/chrome_event_processing_window.mm |
@@ -11,7 +11,7 @@ |
#import "chrome/browser/renderer_host/render_widget_host_view_mac.h" |
#include "chrome/browser/global_keyboard_shortcuts_mac.h" |
-typedef int (*KeyToCommandMapper)(bool, bool, bool, bool, int); |
+typedef int (*KeyToCommandMapper)(bool, bool, bool, bool, int, unichar); |
@implementation ChromeEventProcessingWindow |
@@ -23,10 +23,11 @@ typedef int (*KeyToCommandMapper)(bool, bool, bool, bool, int); |
const bool shiftKey = modifers & NSShiftKeyMask; |
const bool cntrlKey = modifers & NSControlKeyMask; |
const bool optKey = modifers & NSAlternateKeyMask; |
- const int keyCode = [event keyCode]; |
+ const unichar keyCode = [event keyCode]; |
+ const unichar keyChar = KeyCharacterForEvent(event); |
int cmdNum = commandForKeyboardShortcut(cmdKey, shiftKey, cntrlKey, optKey, |
- keyCode); |
+ keyCode, keyChar); |
if (cmdNum != -1) { |
id executor = [self delegate]; |