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

chrome/browser/ui/webui/signin/user_manager_screen_handler.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/ui/webui/signin/user_manager_screen_handler.h"
 
 #include <stddef.h>
 
 #include <utility>
 #include <vector>
@@ skipping 451 matching lines @@
                   GetURLRequestContext()));
     }
 
     const std::string token = entry->GetPasswordChangeDetectionToken();
     if (!token.empty()) {
       oauth_client_->GetTokenHandleInfo(token, kMaxOAuthRetries, this);
       return;
     }
   }
 
-  // In order to support the upgrade case where we have a local hash but no
-  // password token, the user perform a full online reauth.
-  UserManager::ShowReauthDialog(web_ui()->GetWebContents()->GetBrowserContext(),
-                                email_address_,
+  content::BrowserContext* browser_context =
+      web_ui()->GetWebContents()->GetBrowserContext();
+
+// In order to support the upgrade case where we have a local hash but no
+// password token, the user perform a full online reauth.
+// TODO(zmin): Remove the condition for MACOSX once user_manager_mac.cc is
+// updated.
+#if !defined(OS_MACOSX)
+  if (!email_address_.empty()) {
+    UserManager::ShowReauthDialog(browser_context, email_address_,
+                                  signin_metrics::Reason::REASON_UNLOCK);
+  } else {
+    // Fresh sign in via user manager without existed email address.

[anthonyvd, 2016/09/22 18:38:46]

nit: existed -> existing

[zmin, 2016/09/22 19:14:56]

Done.

+    UserManager::ShowSigninDialog(browser_context, profile_path);
+  }
+#else
+  UserManager::ShowReauthDialog(browser_context, email_address_,
                                 signin_metrics::Reason::REASON_UNLOCK);
+#endif
 }

[Roger Tawa OOO till Jul 10th, 2016/09/22 18:59:13]

Don't you need to check the "force" flag in ::HandleLaunchUser() and make sure
to show the sign in dialog there too?  Or is that change planned for a follow up
CL?

[zmin, 2016/09/22 19:14:56]

Yes, this CL is focusing on the error dialog. I change the code here just
because the refactor in the UserManager.

 
 void UserManagerScreenHandler::HandleRemoveUser(const base::ListValue* args) {
   DCHECK(args);
   const base::Value* profile_path_value;
   if (!args->Get(0, &profile_path_value)) {
     NOTREACHED();
     return;
   }
 
   base::FilePath profile_path;
@@ skipping 551 matching lines @@
     Profile* profile, Profile::CreateStatus profile_create_status) {
   Browser* browser = chrome::FindAnyBrowser(profile, false);
   if (browser && browser->window()) {
     OnBrowserWindowReady(browser);
   } else {
     registrar_.Add(this,
                    chrome::NOTIFICATION_BROWSER_WINDOW_READY,
                    content::NotificationService::AllSources());
   }
 }