Mac - show user manager before opening browser.

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/files/file_path.h"
@@ skipping 989 matching lines @@
   if (SessionRestore::IsRestoring(lastProfile) &&
       base::MessageLoop::current()->IsNested())
     return;
 
   NSInteger tag = [sender tag];
 
   // If there are no browser windows, and we are trying to open a browser
   // for a locked profile, we have to show the User Manager instead as the
   // locked profile needs authentication.
   if (IsProfileSignedOut(lastProfile)) {
-    UserManager::Show(lastProfile->GetPath(),
+    UserManager::Show(base::FilePath(),
                       profiles::USER_MANAGER_NO_TUTORIAL,
                       profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);
     return;
   }
 
   switch (tag) {
     case IDC_NEW_TAB:
       // Create a new tab in an existing browser window (which we activate) if
       // possible.
       if (Browser* browser = ActivateBrowser(lastProfile)) {
@@ skipping 74 matching lines @@
         chrome::OpenHelpWindow(lastProfile, chrome::HELP_SOURCE_MENU);
       break;
     case IDC_SHOW_SYNC_SETUP:
       if (Browser* browser = ActivateBrowser(lastProfile)) {
         chrome::ShowBrowserSignin(browser, signin::SOURCE_MENU);
       } else {
         chrome::OpenSyncSetupWindow(lastProfile, signin::SOURCE_MENU);
       }
       break;
     case IDC_TASK_MANAGER:
-      content::RecordAction(UserMetricsAction("TaskManager"));
-      TaskManagerMac::Show();
+      if ([self canOpenNewBrowser]) {
+        // Browser parameter gets ignored on the mac implementation.
+        chrome::OpenTaskManager(NULL);
+      } else {
+        // No way to create a browser, default to the User Manager.
+        UserManager::Show(base::FilePath(),
+                          profiles::USER_MANAGER_NO_TUTORIAL,
+                          profiles::USER_MANAGER_SELECT_PROFILE_TASK_MANAGER);
+      }
       break;
     case IDC_OPTIONS:
       [self showPreferences:sender];
       break;
   }
 }
 
 // Run a (background) application in a new tab.
 - (void)executeApplication:(id)sender {
   NSInteger tag = [sender tag];
@@ skipping 87 matching lines @@
     }
   }
 
   // Otherwise open a new window.
   // If the last profile was locked, we have to open the User Manager, as the
   // profile requires authentication. Similarly, because guest mode is
   // implemented as forced incognito, we can't open a new guest browser either,
   // so we have to show the User Manager as well.
   Profile* lastProfile = [self lastProfile];
   if (lastProfile->IsGuestSession() || IsProfileSignedOut(lastProfile)) {
-    UserManager::Show(lastProfile->GetPath(),
+    UserManager::Show(base::FilePath(),
                       profiles::USER_MANAGER_NO_TUTORIAL,
                       profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);
   } else {
     CreateBrowser(lastProfile);
   }
 
   // We've handled the reopen event, so return NO to tell AppKit not
   // to do anything.
   return NO;
 }
@@ skipping 87 matching lines @@
 - (Profile*)safeLastProfileForNewWindows {
   Profile* profile = [self lastProfile];
 
   // Guest sessions must always be OffTheRecord. Use that when opening windows.
   if (profile->IsGuestSession())
     return profile->GetOffTheRecordProfile();
 
   return profile;
 }
 
+- (bool)canOpenNewBrowser {

[Mark Mentovai, 2014/10/08 16:43:22]

You need to document this.

[Mike Lerman, 2014/10/08 20:23:41]

Done.

+  Profile* profile = [self safeLastProfileForNewWindows];
+
+  const PrefService* prefs = g_browser_process->local_state();
+  return !profile->IsGuestSession() ||
+         prefs->GetBoolean(prefs::kBrowserGuestModeEnabled);
+}
+
 // Various methods to open URLs that we get in a native fashion. We use
 // StartupBrowserCreator here because on the other platforms, URLs to open come
 // through the ProcessSingleton, and it calls StartupBrowserCreator. It's best
 // to bottleneck the openings through that for uniform handling.
 
 - (void)openUrls:(const std::vector<GURL>&)urls {
   // If the browser hasn't started yet, just queue up the URLs.
   if (!startupComplete_) {
     startupUrls_.insert(startupUrls_.end(), urls.begin(), urls.end());
     return;
@@ skipping 41 matching lines @@
 
   [sender replyToOpenOrPrint:NSApplicationDelegateReplySuccess];
 }
 
 // Show the preferences window, or bring it to the front if it's already
 // visible.
 - (IBAction)showPreferences:(id)sender {
   if (Browser* browser = ActivateBrowser([self lastProfile])) {
     // Show options tab in the active browser window.
     chrome::ShowSettings(browser);
-  } else {
+  } else if ([self canOpenNewBrowser]) {
     // No browser window, so create one for the options tab.
     chrome::OpenOptionsWindow([self safeLastProfileForNewWindows]);
+  } else {
+    // No way to create a browser, default to the User Manager.
+    UserManager::Show(base::FilePath(),
+                      profiles::USER_MANAGER_NO_TUTORIAL,
+                      profiles::USER_MANAGER_SELECT_PROFILE_CHROME_SETTINGS);
   }
 }
 
 - (IBAction)orderFrontStandardAboutPanel:(id)sender {
   if (Browser* browser = ActivateBrowser([self lastProfile])) {
     chrome::ShowAboutChrome(browser);
+  } else if ([self canOpenNewBrowser]) {
+    // No browser window, so create one for the options tab.
+    chrome::OpenAboutWindow([self safeLastProfileForNewWindows]);
   } else {
-    // No browser window, so create one for the about tab.
-    chrome::OpenAboutWindow([self safeLastProfileForNewWindows]);
+    // No way to create a browser, default to the User Manager.
+    UserManager::Show(base::FilePath(),
+                      profiles::USER_MANAGER_NO_TUTORIAL,
+                      profiles::USER_MANAGER_SELECT_PROFILE_ABOUT_CHROME);
   }
 }
 
 - (IBAction)toggleConfirmToQuit:(id)sender {
   PrefService* prefService = g_browser_process->local_state();
   bool enabled = prefService->GetBoolean(prefs::kConfirmToQuitEnabled);
   prefService->SetBoolean(prefs::kConfirmToQuitEnabled, !enabled);
 }
 
 - (IBAction)toggleDisplayMessageCenter:(id)sender {
@@ skipping 175 matching lines @@
 
 //---------------------------------------------------------------------------
 
 namespace app_controller_mac {
 
 bool IsOpeningNewWindow() {
   return g_is_opening_new_window;
 }
 
 }  // namespace app_controller_mac