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, 24 insertions, 28 deletions

diff --git a/chrome/browser/global_keyboard_shortcuts_mac.mm b/chrome/browser/global_keyboard_shortcuts_mac.mm
index 1d97f99..3379b5a 100644
--- a/chrome/browser/global_keyboard_shortcuts_mac.mm
+++ b/chrome/browser/global_keyboard_shortcuts_mac.mm
@@ -12,22 +12,22 @@
 const KeyboardShortcutData* GetWindowKeyboardShortcutTable
     (size_t* num_entries) {
   static const KeyboardShortcutData keyboard_shortcuts[] = {
-    {true,  true,  false, false, kVK_ANSI_RightBracket, IDC_SELECT_NEXT_TAB},
-    {false, false, true,  false, kVK_PageDown,      IDC_SELECT_NEXT_TAB},
-    {false, false, true,  false, kVK_Tab,           IDC_SELECT_NEXT_TAB},
-    {true,  true,  false, false, kVK_ANSI_LeftBracket, IDC_SELECT_PREVIOUS_TAB},
-    {false, false, true,  false, kVK_PageUp,        IDC_SELECT_PREVIOUS_TAB},
-    {false, true,  true,  false, kVK_Tab,           IDC_SELECT_PREVIOUS_TAB},
+    {true,  true,  false, kVK_ANSI_RightBracket, IDC_SELECT_NEXT_TAB},
+    {false, false, true,  kVK_PageDown,      IDC_SELECT_NEXT_TAB},
+    {false, false, true,  kVK_Tab,           IDC_SELECT_NEXT_TAB},
+    {true,  true,  false, kVK_ANSI_LeftBracket, IDC_SELECT_PREVIOUS_TAB},
+    {false, false, true,  kVK_PageUp,        IDC_SELECT_PREVIOUS_TAB},
+    {false, true,  true,  kVK_Tab,           IDC_SELECT_PREVIOUS_TAB},
     // Cmd-0..8 select the Nth tab, with cmd-9 being "last tab".
-    {true,  false, false, false, kVK_ANSI_1,        IDC_SELECT_TAB_0},
-    {true,  false, false, false, kVK_ANSI_2,        IDC_SELECT_TAB_1},
-    {true,  false, false, false, kVK_ANSI_3,        IDC_SELECT_TAB_2},
-    {true,  false, false, false, kVK_ANSI_4,        IDC_SELECT_TAB_3},
-    {true,  false, false, false, kVK_ANSI_5,        IDC_SELECT_TAB_4},
-    {true,  false, false, false, kVK_ANSI_6,        IDC_SELECT_TAB_5},
-    {true,  false, false, false, kVK_ANSI_7,        IDC_SELECT_TAB_6},
-    {true,  false, false, false, kVK_ANSI_8,        IDC_SELECT_TAB_7},
-    {true,  false, false, false, kVK_ANSI_9,        IDC_SELECT_LAST_TAB},
+    {true,  false, false, kVK_ANSI_1,        IDC_SELECT_TAB_0},
+    {true,  false, false, kVK_ANSI_2,        IDC_SELECT_TAB_1},
+    {true,  false, false, kVK_ANSI_3,        IDC_SELECT_TAB_2},
+    {true,  false, false, kVK_ANSI_4,        IDC_SELECT_TAB_3},
+    {true,  false, false, kVK_ANSI_5,        IDC_SELECT_TAB_4},
+    {true,  false, false, kVK_ANSI_6,        IDC_SELECT_TAB_5},
+    {true,  false, false, kVK_ANSI_7,        IDC_SELECT_TAB_6},
+    {true,  false, false, kVK_ANSI_8,        IDC_SELECT_TAB_7},
+    {true,  false, false, kVK_ANSI_9,        IDC_SELECT_LAST_TAB},
   };
 
   *num_entries = arraysize(keyboard_shortcuts);
@@ -38,10 +38,10 @@ const KeyboardShortcutData* GetWindowKeyboardShortcutTable
 const KeyboardShortcutData* GetBrowserKeyboardShortcutTable
     (size_t* num_entries) {
   static const KeyboardShortcutData keyboard_shortcuts[] = {
-    {true,  false, false, false, kVK_LeftArrow,     IDC_BACK},
-    {true,  false, false, false, kVK_RightArrow,    IDC_FORWARD},
-    {false, false, false, false, kVK_Delete,        IDC_BACK},
-    {false, true,  false, false, kVK_Delete,        IDC_FORWARD},
+    {true,  false, false, kVK_LeftArrow,     IDC_BACK},
+    {true,  false, false, kVK_RightArrow,    IDC_FORWARD},
+    {false, false, false, kVK_Delete,        IDC_BACK},
+    {false, true,  false, kVK_Delete,        IDC_FORWARD},
   };
 
   *num_entries = arraysize(keyboard_shortcuts);
@@ -51,8 +51,7 @@ const KeyboardShortcutData* GetBrowserKeyboardShortcutTable
 
 static int CommandForKeyboardShortcut(
     const KeyboardShortcutData* (*get_keyboard_shortcut_table)(size_t*),
-    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) {
 
   // Scan through keycodes and see if it corresponds to one of the global
   // shortcuts on file.
@@ -65,7 +64,6 @@ static int CommandForKeyboardShortcut(
     if (it->command_key == command_key &&
         it->shift_key == shift_key &&
         it->cntrl_key == cntrl_key &&
-        it->opt_key == opt_key &&
         it->vkey_code == vkey_code) {
       return it->chrome_command;
     }
@@ -75,17 +73,15 @@ static int CommandForKeyboardShortcut(
 }
 
 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) {
   return CommandForKeyboardShortcut(GetWindowKeyboardShortcutTable,
                                     command_key, shift_key,
-                                    cntrl_key, opt_key, vkey_code);
+                                    cntrl_key, vkey_code);
 }
 
 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) {
   return CommandForKeyboardShortcut(GetBrowserKeyboardShortcutTable,
                                     command_key, shift_key,
-                                    cntrl_key, opt_key, vkey_code);
+                                    cntrl_key, vkey_code);
 }