Revert 29646 - Fix cmdoptleft/right....

chrome/browser/cocoa/chrome_event_processing_window.mm

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/cocoa/chrome_event_processing_window.h"
 
 #include "base/logging.h"
 #import "chrome/browser/cocoa/browser_window_controller.h"
 #import "chrome/browser/cocoa/browser_frame_view.h"
 #import "chrome/browser/cocoa/tab_strip_controller.h"
 #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, int);
 
 @implementation ChromeEventProcessingWindow
 
 - (BOOL)handleExtraKeyboardShortcut:(NSEvent*)event fromTable:
     (KeyToCommandMapper)commandForKeyboardShortcut {
   // Extract info from |event|.
   NSUInteger modifers = [event modifierFlags];
   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, optKey,
+  int cmdNum = commandForKeyboardShortcut(cmdKey, shiftKey, cntrlKey,
       keyCode);
 
   BrowserWindowController* controller =
       (BrowserWindowController*)[self delegate];
   // A bit of sanity.
   DCHECK([controller isKindOfClass:[BrowserWindowController class]]);
   DCHECK([controller respondsToSelector:@selector(executeCommand:)]);
 
   if (cmdNum != -1) {
     [controller executeCommand:cmdNum];
@@ skipping 56 matching lines @@
   redispatchingEvent_ = NO;
 }
 
 - (void)sendEvent:(NSEvent*)event {
   if (!redispatchingEvent_)
     [super sendEvent:event];
 }
 
 @end  // ChromeEventProcessingWindow