Display local signin error without browser and record the path of selected profile in user manager …

chrome/browser/ui/webui/profile_helper.cc

 // Copyright 2016 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/ui/webui/profile_helper.h"
 
 #include "base/bind.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
@@ skipping 14 matching lines @@
                       Profile::CreateStatus status) {
   UserManager::ShowSigninDialog(system_profile, signin_profile_path);
 }
 
 }  // namespace
 void OpenNewWindowForProfile(Profile* profile, Profile::CreateStatus status) {
   if (status != Profile::CREATE_STATUS_INITIALIZED)
     return;
 
   if (signin::IsForceSigninEnabled()) {
-// TODO(zmin): Remove the switcher once the UserManager API is finished on Mac.
-#if !defined(OS_MACOSX)
     if (!UserManager::IsShowing()) {
       UserManager::Show(base::FilePath(), profiles::USER_MANAGER_NO_TUTORIAL,
                         profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);
     }
 
     g_browser_process->profile_manager()->CreateProfileAsync(
         ProfileManager::GetSystemProfilePath(),
         base::Bind(&ShowSigninDialog, profile->GetPath()), base::string16(),
         std::string(), std::string());
 
-#endif
   } else {
     profiles::FindOrCreateNewWindowForProfile(
         profile, chrome::startup::IS_PROCESS_STARTUP,
         chrome::startup::IS_FIRST_RUN, false);
   }
 }
 
 void DeleteProfileAtPath(base::FilePath file_path,
                          content::WebUI* web_ui,
                          ProfileMetrics::ProfileDelete deletion_source) {
   DCHECK(web_ui);
 
   if (!profiles::IsMultipleProfilesEnabled())
     return;
   g_browser_process->profile_manager()->MaybeScheduleProfileForDeletion(
       file_path, base::Bind(&OpenNewWindowForProfile), deletion_source);
 }
 
 }  // namespace webui