Revert 29646 - Fix cmdoptleft/right.

This surfaced because I moved global shortcut handling before menu dispatch recently, and global keyboard handling didn't look at the opt button, so it thought cmdoptleft meant cmdleft and swallowed the event.

BUG=25396
TEST=Focus text box in web. cmdoptleft/right should switch tabs, cmdleft/right should move cursor in text box. Focus web background. cmdoptleft/right should switch tabs, cmdleft/right should do history navigation. Focus omnibox. cmdoptleft/right should still switch tabs, cmdleft/right should move cursor. cmd1/2 should switch tabs in all three places, cmdopt1/2 should not do anything.

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

TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/306025

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

1 files changed, 2 insertions, 5 deletions

diff --git a/chrome/browser/global_keyboard_shortcuts_mac.h b/chrome/browser/global_keyboard_shortcuts_mac.h
index 13a4587..ca24dd4 100644
--- a/chrome/browser/global_keyboard_shortcuts_mac.h
+++ b/chrome/browser/global_keyboard_shortcuts_mac.h
@@ -11,7 +11,6 @@ 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.
 };
@@ -35,15 +34,13 @@ 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, bool opt_key,
-    int vkey_code);
+    bool command_key, bool shift_key, bool cntrl_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, bool opt_key,
-    int vkey_code);
+    bool command_key, bool shift_key, bool cntrl_key, int vkey_code);
 
 // For testing purposes.
 const KeyboardShortcutData* GetWindowKeyboardShortcutTable(size_t* num_entries);