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

chrome/browser/ui/webui/profile_helper.cc

Index: chrome/browser/ui/webui/profile_helper.cc
diff --git a/chrome/browser/ui/webui/profile_helper.cc b/chrome/browser/ui/webui/profile_helper.cc
index 61a0d3a775bbb675e34f4702198c6be0d8650a0d..04bf70c1d48674c254e061abfb8d005d096f9794 100644
--- a/chrome/browser/ui/webui/profile_helper.cc
+++ b/chrome/browser/ui/webui/profile_helper.cc
@@ -32,8 +32,6 @@ void OpenNewWindowForProfile(Profile* profile, Profile::CreateStatus status) {
     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);
@@ -44,7 +42,6 @@ void OpenNewWindowForProfile(Profile* profile, Profile::CreateStatus status) {
         base::Bind(&ShowSigninDialog, profile->GetPath()), base::string16(),
         std::string(), std::string());
 
-#endif
   } else {
     profiles::FindOrCreateNewWindowForProfile(
         profile, chrome::startup::IS_PROCESS_STARTUP,