Remove potential for command-key equivalents to beat the file menu fix-up tim...

chrome/browser/app_controller_mac.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/app_controller_mac.h"
 
 #include "app/l10n_util_mac.h"
 #include "base/command_line.h"
 #include "base/mac_util.h"
 #include "base/message_loop.h"
@@ skipping 190 matching lines @@
 // "preferences".
 - (TabWindowController*)keyWindowTabController {
   NSWindowController* keyWindowController =
       [[NSApp keyWindow] windowController];
   if ([keyWindowController isKindOfClass:[TabWindowController class]])
     return (TabWindowController*)keyWindowController;
 
   return nil;
 }
 
+// Helper routine to get the window controller if the main window is a tabbed
+// window, or nil if not. Examples of non-tabbed windows are "about" or
+// "preferences".
+- (TabWindowController*)mainWindowTabController {
+  NSWindowController* mainWindowController =
+      [[NSApp mainWindow] windowController];
+  if ([mainWindowController isKindOfClass:[TabWindowController class]])
+    return (TabWindowController*)mainWindowController;
+
+  return nil;
+}
+
 // If the window has tabs, make "close window" be cmd-shift-w, otherwise leave
 // it as the normal cmd-w. Capitalization of the key equivalent affects whether
 // the shift modifer is used.
 - (void)adjustCloseWindowMenuItemKeyEquivalent:(BOOL)inHaveTabs {
   [closeWindowMenuItem_ setKeyEquivalent:(inHaveTabs ? @"W" : @"w")];
+  [closeWindowMenuItem_ setKeyEquivalentModifierMask:NSCommandKeyMask];
 }
 
 // If the window has tabs, make "close tab" take over cmd-w, otherwise it
 // shouldn't have any key-equivalent because it should be disabled.
 - (void)adjustCloseTabMenuItemKeyEquivalent:(BOOL)hasTabs {
   if (hasTabs) {
     [closeTabMenuItem_ setKeyEquivalent:@"w"];
     [closeTabMenuItem_ setKeyEquivalentModifierMask:NSCommandKeyMask];
   } else {
     [closeTabMenuItem_ setKeyEquivalent:@""];
     [closeTabMenuItem_ setKeyEquivalentModifierMask:0];
   }
 }
 
+// Explicitly remove any command-key equivalents from the close tab/window
+// menus so that nothing can go haywire if we get a user action during pending
+// updates.
+- (void)clearCloseMenuItemKeyEquivalents {
+  [closeTabMenuItem_ setKeyEquivalent:@""];
+  [closeTabMenuItem_ setKeyEquivalentModifierMask:0];
+  [closeWindowMenuItem_ setKeyEquivalent:@""];
+  [closeWindowMenuItem_ setKeyEquivalentModifierMask:0];
+}
+
 // See if we have a window with tabs open, and adjust the key equivalents for
 // Close Tab/Close Window accordingly
 - (void)fixCloseMenuItemKeyEquivalents {
   TabWindowController* tabController = [self keyWindowTabController];
+  if (!tabController && ![NSApp keyWindow]) {
+    // There might be a small amount of time where there is no key window,
+    // so just use our main browser window if there is one.
+    tabController = [self mainWindowTabController];
+  }
   BOOL windowWithMultipleTabs =
       (tabController && [tabController numberOfTabs] > 1);
   [self adjustCloseWindowMenuItemKeyEquivalent:windowWithMultipleTabs];
   [self adjustCloseTabMenuItemKeyEquivalent:windowWithMultipleTabs];
   fileMenuUpdatePending_ = NO;
 }
 
 // Fix up the "close tab/close window" command-key equivalents. We do this
 // after a delay to ensure that window layer state has been set by the time
 // we do the enabling.
 - (void)delayedFixCloseMenuItemKeyEquivalents {
   if (!fileMenuUpdatePending_) {
+    // The OS prefers keypresses to timers, so it's possible that a cmd-w
+    // can sneak in before this timer fires. In order to prevent that from
+    // having any bad consequences, just clear the keys combos altogether. They
+    // will be reset when the timer eventually fires.
+    [self clearCloseMenuItemKeyEquivalents];
     [self performSelector:@selector(fixCloseMenuItemKeyEquivalents)
                withObject:nil
                afterDelay:0];
     fileMenuUpdatePending_ = YES;
   }
 }
 
 // Called when we get a notification about the window layering changing to
 // update the UI based on the new main window.
 - (void)windowLayeringDidChange:(NSNotification*)notify {
@@ skipping 421 matching lines @@
 @end
 
 //---------------------------------------------------------------------------
 
 // Stub for cross-platform method that isn't called on Mac OS X.
 void ShowOptionsWindow(OptionsPage page,
                        OptionsGroup highlight_group,
                        Profile* profile) {
   NOTIMPLEMENTED();
 }