[Signin Error Dialog] (3/3) Added the triggering code

chrome/browser/ui/webui/signin/inline_login_handler_impl.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/inline_login_handler_impl.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <vector>
@@ skipping 437 matching lines @@
       break;
     default:
       DCHECK(false) << "Invalid action";
   }
   base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
 }
 
 void InlineSigninHelper::OnClientOAuthFailure(
   const GoogleServiceAuthError& error) {
   if (handler_)
-    handler_->HandleLoginError(error.ToString());
+    handler_->HandleLoginError(error.ToString(), base::string16());
 
   AboutSigninInternals* about_signin_internals =
     AboutSigninInternalsFactory::GetForProfile(profile_);
   about_signin_internals->OnRefreshTokenReceived("Failure");
 
   base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
 }
 
 InlineLoginHandlerImpl::InlineLoginHandlerImpl()
       : confirm_untrusted_signin_(false),
@@ skipping 306 matching lines @@
   std::string default_email;
   std::string validate_email;
   if (net::GetValueForKeyInQuery(params.url, "email", &default_email) &&
       net::GetValueForKeyInQuery(params.url, "validateEmail",
                                  &validate_email) &&
       validate_email == "1") {
     if (!gaia::AreEmailsSame(params.email, default_email)) {
       if (params.handler) {
         params.handler->HandleLoginError(
             l10n_util::GetStringFUTF8(IDS_SYNC_WRONG_EMAIL,
-                                      base::UTF8ToUTF16(default_email)));
+                                      base::UTF8ToUTF16(default_email)),
+            base::UTF8ToUTF16(params.email));
       }
       return;
     }
   }
 
   signin_metrics::AccessPoint access_point =
       signin::GetAccessPointForPromoURL(params.url);
   signin_metrics::Reason reason =
       signin::GetSigninReasonForPromoURL(params.url);
   LogHistogramValue(signin_metrics::HISTOGRAM_ACCEPTED);
@@ skipping 21 matching lines @@
     }
     default:
       // No need to change |can_offer_for|.
       break;
   }
 
   std::string error_msg;
   bool can_offer = CanOffer(profile, can_offer_for, params.gaia_id,
                             params.email, &error_msg);
   if (!can_offer) {
-    if (params.handler)
-      params.handler->HandleLoginError(error_msg);
+    if (params.handler) {
+      params.handler->HandleLoginError(error_msg,
+                                       base::UTF8ToUTF16(params.email));
+    }
     return;
   }
 
   AboutSigninInternals* about_signin_internals =
       AboutSigninInternalsFactory::GetForProfile(profile);
   about_signin_internals->OnAuthenticationResultReceived("Successful");
 
   SigninClient* signin_client =
       ChromeSigninClientFactory::GetForProfile(profile);
   std::string signin_scoped_device_id =
@@ skipping 24 matching lines @@
         entry->SetIsSigninRequired(false);
       }
     }
   }
 
   if (params.handler)
     params.handler->web_ui()->CallJavascriptFunctionUnsafe(
         "inline.login.closeDialog");
 }
 
-void InlineLoginHandlerImpl::HandleLoginError(const std::string& error_msg) {
+void InlineLoginHandlerImpl::HandleLoginError(const std::string& error_msg,
+                                              const base::string16& email) {
   SyncStarterCallback(OneClickSigninSyncStarter::SYNC_SETUP_FAILURE);
   Browser* browser = GetDesktopBrowser();
   Profile* profile = Profile::FromWebUI(web_ui());
 
   CloseModalSigninIfNeeded(this);
   if (browser && !error_msg.empty()) {
-    LoginUIServiceFactory::GetForProfile(profile)->
-        DisplayLoginResult(browser, base::UTF8ToUTF16(error_msg));
+    LoginUIServiceFactory::GetForProfile(profile)->DisplayLoginResult(
+        browser, base::UTF8ToUTF16(error_msg), email);
   }
 }
 
 Browser* InlineLoginHandlerImpl::GetDesktopBrowser() {
   Browser* browser = chrome::FindBrowserWithWebContents(
       web_ui()->GetWebContents());
   if (!browser)
     browser = chrome::FindLastActiveWithProfile(Profile::FromWebUI(web_ui()));
   return browser;
 }
@@ skipping 41 matching lines @@
     }
 
     if (show_account_management) {
       browser->window()->ShowAvatarBubbleFromAvatarButton(
           BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT,
           signin::ManageAccountsParams(),
           signin_metrics::AccessPoint::ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN);
     }
   }
 }