[Mac] Disable menu certain menu items when a modal dialog or sheet is present.

chrome/browser/app_controller_mac.mm

 // Copyright (c) 2010 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/auto_reset.h"
 #include "base/command_line.h"
 #include "base/mac_util.h"
@@ skipping 556 matching lines @@
 }
 
 // Called to determine if we should enable the "restore tab" menu item.
 // Checks with the TabRestoreService to see if there's anything there to
 // restore and returns YES if so.
 - (BOOL)canRestoreTab {
   TabRestoreService* service = [self defaultProfile]->GetTabRestoreService();
   return service && !service->entries().empty();
 }
 
-// Returns true if there is no browser window, or if the active window is
-// blocked by a modal dialog.
-- (BOOL)keyWindowIsMissingOrBlocked {
+// Returns true if there is not a modal window (either window- or application-
+// modal) blocking the active browser. Note that tab modal dialogs (HTTP auth
+// sheets) will not count as blocking the browser. But things like open/save
+// dialogs that are window modal will block the browser.
+- (BOOL)keyWindowIsNotModal {
   Browser* browser = BrowserList::GetLastActive();
-  return browser == NULL ||
+  return [NSApp modalWindow] == nil && (browser &&
          ![[browser->window()->GetNativeHandle() attachedSheet]
-           isKindOfClass:[NSWindow class]];
+             isKindOfClass:[NSWindow class]]);
 }
 
 // Called to validate menu items when there are no key windows. 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.
 - (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)item {
   SEL action = [item action];
   BOOL enable = NO;
   if (action == @selector(commandDispatch:)) {
     NSInteger tag = [item tag];
     if (menuState_->SupportsCommand(tag)) {
       switch (tag) {
         // The File Menu commands are not automatically disabled by Cocoa when a
         // dialog sheet obscures the browser window, so we disable several of
         // them here.  We don't need to include IDC_CLOSE_WINDOW, because
         // app_controller is only activated when there are no key windows (see
         // function comment).
         case IDC_RESTORE_TAB:
-          enable = [self keyWindowIsMissingOrBlocked] && [self canRestoreTab];
+          enable = [self keyWindowIsNotModal] && [self canRestoreTab];
           break;
+        // Browser-level items that open in new tabs should not open if there's
+        // a window- or app-modal dialog.
         case IDC_OPEN_FILE:
         case IDC_NEW_TAB:
-          enable = [self keyWindowIsMissingOrBlocked];
+        case IDC_SHOW_HISTORY:
+        case IDC_SHOW_BOOKMARK_MANAGER:
+          enable = [self keyWindowIsNotModal];
+          break;
+        // Browser-level items that open in new windows.
+        case IDC_NEW_WINDOW:
+        case IDC_TASK_MANAGER:
+          // Allow the user to open a new window if there's a window-modal
+          // dialog.
+          enable = [self keyWindowIsNotModal] || ([NSApp modalWindow] == nil);
           break;
         case IDC_SYNC_BOOKMARKS: {
           Profile* defaultProfile = [self defaultProfile];
           // The profile may be NULL during shutdown -- see
           // http://code.google.com/p/chromium/issues/detail?id=43048 .
           //
           // TODO(akalin,viettrungluu): Figure out whether this method
           // can be prevented from being called if defaultProfile is
           // NULL.
           if (!defaultProfile) {
             LOG(WARNING)
                 << "NULL defaultProfile detected -- not doing anything";
             break;
           }
-          enable = ProfileSyncService::IsSyncEnabled();
+          enable = ProfileSyncService::IsSyncEnabled() &&
+                   [self keyWindowIsNotModal];
           sync_ui_util::UpdateSyncItem(item, enable, defaultProfile);
           break;
         }
         default:
-          enable = menuState_->IsCommandEnabled(tag) ? YES : NO;
+          enable = menuState_->IsCommandEnabled(tag) ?
+                   [self keyWindowIsNotModal] : NO;
       }
     }
   } else if (action == @selector(terminate:)) {
     enable = YES;
   } else if (action == @selector(showPreferences:)) {
     enable = YES;
   } else if (action == @selector(orderFrontStandardAboutPanel:)) {
     enable = YES;
   } else if (action == @selector(newWindowFromDock:)) {
     enable = YES;
@@ skipping 375 matching lines @@
   [appController showPreferencesWindow:nil page:page profile:profile];
 }
 
 namespace app_controller_mac {
 
 bool IsOpeningNewWindow() {
   return g_is_opening_new_window;
 }
 
 }  // namespace app_controller_mac