Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(128)

Unified Diff: chrome/browser/cocoa/chrome_event_processing_window.mm

Issue 313004: Fix cmd-opt-left/right. (Closed)
Patch Set: Rebase ToT Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/global_keyboard_shortcuts_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d8755bf5eda0fada0c90c4194f1249a3820e93cc..e5c569a271ed0df43174f2f38f0d352e7e96342e 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, int);
+typedef int (*KeyToCommandMapper)(bool, bool, bool, bool, int);
@implementation ChromeEventProcessingWindow
@@ -22,9 +22,10 @@ typedef int (*KeyToCommandMapper)(bool, bool, bool, int);
const bool cmdKey = modifers & NSCommandKeyMask;
const bool shiftKey = modifers & NSShiftKeyMask;
const bool cntrlKey = modifers & NSControlKeyMask;
+ const bool optKey = modifers & NSAlternateKeyMask;
const int keyCode = [event keyCode];
- int cmdNum = commandForKeyboardShortcut(cmdKey, shiftKey, cntrlKey,
+ int cmdNum = commandForKeyboardShortcut(cmdKey, shiftKey, cntrlKey, optKey,
keyCode);
BrowserWindowController* controller =
« no previous file with comments | « no previous file | chrome/browser/global_keyboard_shortcuts_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698