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 454 matching lines @@
     const std::string token = entry->GetPasswordChangeDetectionToken();
     if (!token.empty()) {
       oauth_client_->GetTokenHandleInfo(token, kMaxOAuthRetries, this);
       return;
     }
   }
 
   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) {
   DCHECK(args);
   const base::Value* profile_path_value;
   if (!args->Get(0, &profile_path_value)) {
     NOTREACHED();
     return;
   }
 
@@ skipping 552 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());
   }
 }