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

Index: chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
index c34c0545d581c08c2d18acfe9f120e07313cd216..b6916ed418ac4ee312543bca9ac7238ac41d0c0d 100644
--- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
+++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
@@ -472,22 +472,15 @@ void UserManagerScreenHandler::HandleAuthenticatedLaunchUser(
   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()) {
+    // In order to support the upgrade case where we have a local hash but no
+    // password token, the user perform a full online reauth.

[michaelpg, 2016/10/14 15:46:31]

grammar: "have the user perform" or "the user must perform" or "the user
performs"

[zmin, 2016/10/14 16:03:21]

Done.

     UserManager::ShowReauthDialog(browser_context, email_address_,
                                   signin_metrics::Reason::REASON_UNLOCK);
   } else {
     // Fresh sign in via user manager without existing email address.
     UserManager::ShowSigninDialog(browser_context, profile_path);
   }
-#else
-  UserManager::ShowReauthDialog(browser_context, email_address_,
-                                signin_metrics::Reason::REASON_UNLOCK);
-#endif
 }
 
 void UserManagerScreenHandler::HandleRemoveUser(const base::ListValue* args) {