Mac - show user manager before opening browser.

chrome/browser/profiles/profile_window.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/profiles/profile_window.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 137 matching lines @@
     Profile* guest_profile,
     Profile::CreateStatus status) {
   if (status != Profile::CREATE_STATUS_INITIALIZED || callback.is_null())
     return;
 
   // Tell the webui which user should be focused.
   std::string page = chrome::kChromeUIUserManagerURL;
 
   if (tutorial_mode == profiles::USER_MANAGER_TUTORIAL_OVERVIEW) {
     page += profiles::kUserManagerDisplayTutorial;
-  } else if (!profile_path_to_focus.empty()) {
+  } else if (!profile_path_to_focus.empty() &&
+             profile_path_to_focus != ProfileManager::GetGuestProfilePath()) {

[noms (inactive), 2014/10/07 21:25:48]

Not sure why this would happen. Up until now, |profile_path_to_focus| was always
the path of a legit, non guest Profile...

[Mike Lerman, 2014/10/08 15:41:37]

It was! Until someone (rhymes with poms) changed code (especially on Mac, CL
585653002) to make the Guest Profile the Last Active Profile, which the
app_controller_mac passes the last active's path as the path for the User
Manager.

As per discussion offline, removing this call but adding a DCHECK in
UserManager*::Show().

     const ProfileInfoCache& cache =
         g_browser_process->profile_manager()->GetProfileInfoCache();
     size_t index = cache.GetIndexOfProfileWithPath(profile_path_to_focus);
     if (index != std::string::npos) {
       page += "#";
       page += base::IntToString(index);
     }
   } else if (profile_open_action ==
              profiles::USER_MANAGER_SELECT_PROFILE_TASK_MANAGER) {
     page += profiles::kUserManagerSelectProfileTaskManager;
   } else if (profile_open_action ==
              profiles::USER_MANAGER_SELECT_PROFILE_ABOUT_CHROME) {
     page += profiles::kUserManagerSelectProfileAboutChrome;
+  } else if (profile_open_action ==
+             profiles::USER_MANAGER_SELECT_PROFILE_CHROME_SETTINGS) {
+    page += profiles::kUserManagerSelectProfileChromeSettings;
   }
   callback.Run(guest_profile, page);
 }
 
 // Updates Chrome services that require notification when
 // the new_profile_management's status changes.
 void UpdateServicesWithNewProfileManagementFlag(Profile* profile,
                                                 bool new_flag_status) {
   AccountReconcilor* account_reconcilor =
       AccountReconcilorFactory::GetForProfile(profile);
   account_reconcilor->OnNewProfileManagementFlagChanged(new_flag_status);
 }
 
 }  // namespace
 
 namespace profiles {
 
 // User Manager parameters are prefixed with hash.
 const char kUserManagerDisplayTutorial[] = "#tutorial";
 const char kUserManagerSelectProfileTaskManager[] = "#task-manager";
 const char kUserManagerSelectProfileAboutChrome[] = "#about-chrome";
+const char kUserManagerSelectProfileChromeSettings[] = "#chrome-settings";
 
 void FindOrCreateNewWindowForProfile(
     Profile* profile,
     chrome::startup::IsProcessStartup process_startup,
     chrome::startup::IsFirstRun is_first_run,
     chrome::HostDesktopType desktop_type,
     bool always_create) {
 #if defined(OS_IOS)
   NOTREACHED();
 #else
@@ skipping 217 matching lines @@
     case BrowserWindow::AVATAR_BUBBLE_MODE_SHOW_ERROR:
       *bubble_view_mode = BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
       *tutorial_mode = TUTORIAL_MODE_SHOW_ERROR;
       return;
     default:
       *bubble_view_mode = profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
   }
 }
 
 }  // namespace profiles