Mac: Make Cmd-[ and Cmd-] work properly again.

chrome/browser/cocoa/browser_window_controller.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.
 
 #include <Carbon/Carbon.h>
 
 #include "base/mac_util.h"
 #include "base/scoped_nsdisable_screen_updates.h"
 #import "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
@@ skipping 531 matching lines @@
 
 - (BOOL)supportsFullscreen {
   // TODO(avi, thakis): GTMWindowSheetController has no api to move
   // tabsheets between windows. Until then, we have to prevent having to
   // move a tabsheet between windows, e.g. no fullscreen toggling
   NSArray* a = [[tabStripController_ sheetController] viewsWithAttachedSheets];
   return [a count] == 0;
 }
 
 // Called to validate menu and toolbar items when this window is key. All the
-// items we care about have been set with the |commandDispatch:| action and
-// a target of FirstResponder in IB. If it's not one of those, let it
-// continue up the responder chain to be handled elsewhere. We pull out the
-// tag as the cross-platform constant to differentiate and dispatch the
-// various commands.
+// items we care about have been set with the |-commandDispatch:| or
+// |-commandDispatchUsingKeyModifiers:| actions and a target of FirstResponder
+// in IB. If it's not one of those, let it continue up the responder chain to be
+// handled elsewhere. We pull out the tag as the cross-platform constant to
+// differentiate and dispatch the various commands.
 // NOTE: we might have to handle state for app-wide menu items,
 // although we could cheat and directly ask the app controller if our
 // command_updater doesn't support the command. This may or may not be an issue,
 // too early to tell.
 - (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)item {
   SEL action = [item action];
   BOOL enable = NO;
-  if (action == @selector(commandDispatch:)) {
+  if (action == @selector(commandDispatch:) ||
+      action == @selector(commandDispatchUsingKeyModifiers:)) {
     NSInteger tag = [item tag];
     if (browser_->command_updater()->SupportsCommand(tag)) {
       // Generate return value (enabled state)
       enable = browser_->command_updater()->IsCommandEnabled(tag) ? YES : NO;
       switch (tag) {
         case IDC_CLOSE_TAB:
           // Disable "close tab" if we're not the key window or if there's only
           // one tab.
           enable &= [self numberOfTabs] > 1 && [[self window] isKeyWindow];
           break;
@@ skipping 16 matching lines @@
   return enable;
 }
 
 // Called when the user picks a menu or toolbar item when this window is key.
 // Calls through to the browser object to execute the command. This assumes that
 // the command is supported and doesn't check, otherwise it would have been
 // disabled in the UI in validateUserInterfaceItem:.
 - (void)commandDispatch:(id)sender {
   NSInteger tag = [sender tag];
   switch (tag) {
-    case IDC_FORWARD:
-    case IDC_BACK:
-      // For this, we need to check the key flags to figure out where to open
-      // the history item. Note that |Revert()| isn't needed, since any
-      // navigation in the current tab will reset the location bar's contents.
-      browser_->ExecuteCommandWithDisposition(tag,
-          event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]));
-      return;
     case IDC_RELOAD:
       if ([sender isKindOfClass:[NSButton class]]) {
         // We revert the bar when the reload button is pressed, but don't when
         // Command+r is pressed (Issue 15464). Unlike the event handler function
         // for Windows (ToolbarView::ButtonPressed()), this function handles
         // both reload button press event and Command+r press event. Thus the
         // 'isKindofClass' check is necessary.
         [self locationBar]->Revert();
       }
       break;
   }
   browser_->ExecuteCommand(tag);
 }
 
+// Same as |-commandDispatch:|, but executes commands using a disposition
+// determined by the key flags.
+- (void)commandDispatchUsingKeyModifiers:(id)sender {
+  NSInteger tag = [sender tag];
+  browser_->ExecuteCommandWithDisposition(tag,
+      event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]));
+}
+
 // Called when another part of the internal codebase needs to execute a
 // command.
 - (void)executeCommand:(int)command {
   if (browser_->command_updater()->IsCommandEnabled(command))
     browser_->ExecuteCommand(command);
 }
 
 // StatusBubble delegate method: tell the status bubble how far above the bottom
 // of the window it should position itself.
 - (float)verticalOffsetForStatusBubble {
@@ skipping 917 matching lines @@
   if (frameOverlayInactiveImage) {
     [theme setValue:frameOverlayInactiveImage
        forAttribute:@"overlay"
               style:GTMThemeStyleWindow
               state:GTMThemeStateInactiveWindow];
   }
 
   return theme;
 }
 @end