Make window cycling work even if you change it to something else than cmd-` in sysprefs.

chrome/browser/tab_contents/tab_contents_view_mac.mm

 // Copyright (c) 2006-2008 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 <Carbon/Carbon.h>
 
 #include "chrome/browser/tab_contents/tab_contents_view_mac.h"
 
 #include <string>
 
 #include "chrome/browser/browser.h" // TODO(beng): this dependency is awful.
+#import "chrome/browser/chrome_application_mac.h"

[pink (ping after 24hrs), 2009/10/20 16:14:44]

i don't see why this include is needed. Why does the TCV need to know about the
application?

[Nico, 2009/10/20 16:32:24]

Historical reasons. http://codereview.chromium.org/308002 . Thanks.

 #import "chrome/browser/cocoa/focus_tracker.h"
 #import "chrome/browser/cocoa/chrome_browser_window.h"
 #import "chrome/browser/cocoa/browser_window_controller.h"
 #include "chrome/browser/global_keyboard_shortcuts_mac.h"
 #include "chrome/browser/cocoa/sad_tab_view.h"
 #import "chrome/browser/cocoa/web_drag_source.h"
 #import "chrome/browser/cocoa/web_drop_target.h"
 #include "chrome/browser/renderer_host/render_view_host_factory.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h"
@@ skipping 287 matching lines @@
 - (TabContents*)tabContents {
   return tabContentsView_->tab_contents();
 }
 
 - (void)processKeyboardEvent:(NativeWebKeyboardEvent*)wkEvent {
   if (wkEvent->skip_in_browser)
     return;
 
   NSEvent* event = wkEvent->os_event;
 
-  if ([event type] == NSKeyDown && ([event modifierFlags] & NSCommandKeyMask)) {
-    // We need to dispatch this to the menu.
-    if ([[NSApp mainMenu] performKeyEquivalent:event])
-      return;
-  }
-
-  // Cmd-` is not in the menu and it's apparently handled by |NSApp sendEvent|
-  // if the application doesn't swallow it. We do, so we need to handle this
-  // key ourself. On foreign keyboards, the "switch windows" key is not the
-  // ` key, so do this by keycode instead of |event characters|.
-  if ([event type] == NSKeyDown &&
-      [event keyCode] == kVK_ANSI_Grave &&
-      [NSApp respondsToSelector:@selector(_cycleWindowsReversed:)]) {
-    const NSUInteger kModifierMask = NSShiftKeyMask |
-                                     NSControlKeyMask |
-                                     NSAlternateKeyMask |
-                                     NSCommandKeyMask;
-    if (([event modifierFlags] & kModifierMask) == NSCommandKeyMask)
-      [NSApp _cycleWindowsReversed:NO];
-    else if (([event modifierFlags] & kModifierMask) ==
-        (NSCommandKeyMask | NSShiftKeyMask) &&
-        [NSApp respondsToSelector:@selector(_cycleWindowsReversed:)])
-      [NSApp _cycleWindowsReversed:YES];
-  }
-
-  // If this tab is no longer active, it's window will be |nil|. In that case,
+  // If this tab is no longer active, its window will be |nil|. In that case,
   // best ignore the event.
   if (![self window])
     return;
+  ChromeEventProcessingWindow* window =
+      (ChromeEventProcessingWindow*)[self window];
+  DCHECK([window isKindOfClass:[ChromeEventProcessingWindow class]]);
 
   // Do not fire shortcuts on key up.
   if ([event type] == NSKeyDown) {
-    ChromeBrowserWindow* window = (ChromeBrowserWindow*)[self window];
-    DCHECK([window isKindOfClass:[ChromeBrowserWindow class]]);
     if ([window handleExtraBrowserKeyboardShortcut:event])
       return;
     if ([window handleExtraWindowKeyboardShortcut:event])
       return;
   }
 
-  if ([event type] == NSKeyDown)
-    [super keyDown:event];
-  else if ([event type] == NSKeyUp)
-    [super keyUp:event];
+  // We need to re-dispatch the event, so that it is sent to the menu or other
+  // cocoa mechanisms (such as the cmd-` handler).
+  RenderWidgetHostViewCocoa* rwhv = static_cast<RenderWidgetHostViewCocoa*>(
+      tabContentsView_->GetContentNativeView());
+  DCHECK([rwhv isKindOfClass:[RenderWidgetHostViewCocoa class]]);
+  [rwhv setIgnoreKeyEvents:YES];
+  [window redispatchEvent:event];
+  [rwhv setIgnoreKeyEvents:NO];
 }
 
 - (void)mouseEvent:(NSEvent *)theEvent {
   TabContents* tabContents = [self tabContents];
   if (tabContents->delegate()) {
     if ([theEvent type] == NSMouseMoved)
       tabContents->delegate()->ContentsMouseEvent(tabContents, true);
     if ([theEvent type] == NSMouseExited)
       tabContents->delegate()->ContentsMouseEvent(tabContents, false);
   }
@@ skipping 94 matching lines @@
 }
 
 - (BOOL)performDragOperation:(id<NSDraggingInfo>)sender {
   return [dropTarget_ performDragOperation:sender view:self];
 }
 
 // Tons of stuff goes here, where we grab events going on in Cocoaland and send
 // them into the C++ system. TODO(avi): all that jazz
 
 @end