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

Unified Diff: chrome/browser/global_keyboard_shortcuts_mac.h

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
Index: chrome/browser/global_keyboard_shortcuts_mac.h
diff --git a/chrome/browser/global_keyboard_shortcuts_mac.h b/chrome/browser/global_keyboard_shortcuts_mac.h
index ca24dd4830f502be42ba99176f1b8f44a187d2a0..13a4587eeed8d77d7eda34bda6009a5f1d2dbed5 100644
--- a/chrome/browser/global_keyboard_shortcuts_mac.h
+++ b/chrome/browser/global_keyboard_shortcuts_mac.h
@@ -11,6 +11,7 @@ struct KeyboardShortcutData {
bool command_key;
bool shift_key;
bool cntrl_key;
+ bool opt_key;
int vkey_code; // Virtual Key code for the command.
int chrome_command; // The chrome command # to execute for this shortcut.
};
@@ -34,13 +35,15 @@ struct KeyboardShortcutData {
// opportunity to override the shortcut (with the exception of the tab contents,
// which first checks if the current web page wants to handle the shortcut).
int CommandForWindowKeyboardShortcut(
- bool command_key, bool shift_key, bool cntrl_key, int vkey_code);
+ bool command_key, bool shift_key, bool cntrl_key, bool opt_key,
+ int vkey_code);
// This returns shortcuts that should work only if the tab contents have focus
// (e.g. cmd-left, which shouldn't do history navigation if e.g. the omnibox has
// focus).
int CommandForBrowserKeyboardShortcut(
- bool command_key, bool shift_key, bool cntrl_key, int vkey_code);
+ bool command_key, bool shift_key, bool cntrl_key, bool opt_key,
+ int vkey_code);
// For testing purposes.
const KeyboardShortcutData* GetWindowKeyboardShortcutTable(size_t* num_entries);
« no previous file with comments | « chrome/browser/cocoa/chrome_event_processing_window.mm ('k') | chrome/browser/global_keyboard_shortcuts_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698