Make Mac menu code obey incognito availability.

chrome/browser/app_controller_mac.mm

 // Copyright (c) 2012 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 "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 21 matching lines @@
 #include "chrome/browser/service/service_process_control.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/sync/sync_ui_util_mac.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_mac.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/confirm_quit.h"
@@ skipping 463 matching lines @@
 
   // Rebuild the menus with the new profile.
   lastProfile_ = profile;
 
   bookmarkMenuBridge_.reset(new BookmarkMenuBridge(lastProfile_,
       [[[NSApp mainMenu] itemWithTag:IDC_BOOKMARKS_MENU] submenu]));
   // No need to |BuildMenu| here.  It is done lazily upon menu access.
 
   historyMenuBridge_.reset(new HistoryMenuBridge(lastProfile_));
   historyMenuBridge_->BuildMenu();
+
+  chrome::BrowserCommandController::
+  UpdateSharedCommandsForIncognitoAvailability(menuState_.get(), lastProfile_);

[Robert Sesek, 2013/01/16 18:24:50]

nit: indent 4

[Avi (use Gerrit), 2013/01/16 19:04:37]

Done.

+  profilePrefRegistrar_.reset(new PrefChangeRegistrar());
+  profilePrefRegistrar_->Init(lastProfile_->GetPrefs());
+  profilePrefRegistrar_->Add(
+      prefs::kIncognitoModeAvailability,
+      base::Bind(&chrome::BrowserCommandController::
+                 UpdateSharedCommandsForIncognitoAvailability,

[Robert Sesek, 2013/01/16 18:24:50]

nit: indent 4

[Avi (use Gerrit), 2013/01/16 19:04:37]

Done.

+                 menuState_.get(),
+                 lastProfile_));
 }
 
 - (void)checkForAnyKeyWindows {
   if ([NSApp keyWindow])
     return;
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_NO_KEY_WINDOW,
       content::NotificationService::AllSources(),
       content::NotificationService::NoDetails());
@@ skipping 56 matching lines @@
   // (probably-empty) list of URLs from the command line.
   if (startupUrls_.size()) {
     [self openUrls:startupUrls_];
     [self clearStartupUrls];
   }
 
   const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
   if (!parsed_command_line.HasSwitch(switches::kEnableExposeForTabs)) {
     [tabposeMenuItem_ setHidden:YES];
   }
+
+  PrefService* localState = g_browser_process->local_state();
+  if (localState) {
+    localPrefRegistrar_.Init(localState);
+    localPrefRegistrar_.Add(
+        prefs::kAllowFileSelectionDialogs,
+        base::Bind(&chrome::BrowserCommandController::UpdateOpenFileState,
+                   menuState_.get()));
+  }
 }
 
 // This is called after profiles have been loaded and preferences registered.
 // It is safe to access the default profile here.
 - (void)applicationDidBecomeActive:(NSNotification*)notify {
   content::PluginService::GetInstance()->AppActivated();
 }
 
 // Helper function for populating and displaying the in progress downloads at
 // exit alert panel.
@@ skipping 74 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 =
       TabRestoreServiceFactory::GetForProfile([self lastProfile]);
   return service && !service->entries().empty();
 }
 
-// Returns true if there is not a modal window (either window- or application-
+// Returns true if there is 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 {
+- (BOOL)keyWindowIsModal {
+  if ([NSApp modalWindow])
+    return YES;
+
   Browser* browser = chrome::GetLastActiveBrowser();
-  return [NSApp modalWindow] == nil && (!browser ||
-         ![[browser->window()->GetNativeWindow() attachedSheet]
-             isKindOfClass:[NSWindow class]]);
+  return browser &&
+         [[browser->window()->GetNativeWindow() attachedSheet]
+             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:)) {
+  if (action == @selector(commandDispatch:) ||
+      action == @selector(commandFromDock:)) {
     NSInteger tag = [item tag];
-    if (menuState_->SupportsCommand(tag)) {
+    if (menuState_ &&  // NULL in tests.
+        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 keyWindowIsNotModal] && [self canRestoreTab];
+          enable = ![self keyWindowIsModal] && [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:
         case IDC_SHOW_HISTORY:
         case IDC_SHOW_BOOKMARK_MANAGER:
-          enable = [self keyWindowIsNotModal];
+          enable = ![self keyWindowIsModal];
           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);
+          enable = ![self keyWindowIsModal];
           break;
         case IDC_SHOW_SYNC_SETUP: {
           Profile* lastProfile = [self lastProfile];
           // 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 lastProfile is
           // NULL.
           if (!lastProfile) {
             LOG(WARNING)
                 << "NULL lastProfile detected -- not doing anything";
             break;
           }
-          enable = lastProfile->IsSyncAccessible() &&
-              [self keyWindowIsNotModal];
+          enable = lastProfile->IsSyncAccessible() && ![self keyWindowIsModal];
           sync_ui_util::UpdateSyncItem(item, enable, lastProfile);
           break;
         }
         case IDC_FEEDBACK:
           enable = NO;
           break;
         default:
           enable = menuState_->IsCommandEnabled(tag) ?
-                   [self keyWindowIsNotModal] : NO;
+                   ![self keyWindowIsModal] : 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(commandFromDock:)) {
     enable = YES;
@@ skipping 448 matching lines @@
   if (profilesAdded)
     [dockMenu addItem:[NSMenuItem separatorItem]];
 
   NSString* titleStr = l10n_util::GetNSStringWithFixup(IDS_NEW_WINDOW_MAC);
   scoped_nsobject<NSMenuItem> item(
       [[NSMenuItem alloc] initWithTitle:titleStr
                                  action:@selector(commandFromDock:)
                           keyEquivalent:@""]);
   [item setTarget:self];
   [item setTag:IDC_NEW_WINDOW];
+  [item setEnabled:[self validateUserInterfaceItem:item]];
   [dockMenu addItem:item];
 
   titleStr = l10n_util::GetNSStringWithFixup(IDS_NEW_INCOGNITO_WINDOW_MAC);
   item.reset(
       [[NSMenuItem alloc] initWithTitle:titleStr
                                  action:@selector(commandFromDock:)
                           keyEquivalent:@""]);
   [item setTarget:self];
   [item setTag:IDC_NEW_INCOGNITO_WINDOW];
+  [item setEnabled:[self validateUserInterfaceItem:item]];
   [dockMenu addItem:item];
 
   // TODO(rickcam): Mock out BackgroundApplicationListModel, then add unit
   // tests which use the mock in place of the profile-initialized model.
 
   // Avoid breaking unit tests which have no profile.
   if (profile) {
     BackgroundApplicationListModel applications(profile);
     if (applications.size()) {
       int position = 0;
@@ skipping 65 matching lines @@
 
 //---------------------------------------------------------------------------
 
 namespace app_controller_mac {
 
 bool IsOpeningNewWindow() {
   return g_is_opening_new_window;
 }
 
 }  // namespace app_controller_mac