Fix some problems with new reauth:

chrome/browser/ui/webui/signin/inline_login_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/inline_login_handler.h"
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 29 matching lines @@
 
   const std::string& app_locale = g_browser_process->GetApplicationLocale();
   params.SetString("hl", app_locale);
   GaiaUrls* gaiaUrls = GaiaUrls::GetInstance();
   params.SetString("gaiaUrl", gaiaUrls->gaia_url().spec());
   params.SetInteger("authMode", InlineLoginHandler::kDesktopAuthMode);
 
   const GURL& current_url = web_ui()->GetWebContents()->GetURL();
   signin::Source source = signin::GetSourceForPromoURL(current_url);
   if (source == signin::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT ||
-      source == signin::SOURCE_AVATAR_BUBBLE_SIGN_IN) {
+      source == signin::SOURCE_AVATAR_BUBBLE_SIGN_IN ||
+      source == signin::SOURCE_REAUTH) {
     // Drop the leading slash in the path.
     params.SetString(
         "gaiaPath",
         GaiaUrls::GetInstance()->embedded_signin_url().path().substr(1));
   }
 
   params.SetString(
       "continueUrl",
       signin::GetLandingURL("source", static_cast<int>(source)).spec());
 
   std::string default_email;
-  if (source != signin::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT) {
+  if (source != signin::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT &&
+      source != signin::SOURCE_REAUTH) {
     default_email = Profile::FromWebUI(web_ui())->GetPrefs()->GetString(
         prefs::kGoogleServicesLastUsername);
   } else {
     if (!net::GetValueForKeyInQuery(current_url, "email", &default_email))
       default_email.clear();
   }
   if (!default_email.empty())
     params.SetString("email", default_email);
 
   std::string frame_url;
@@ skipping 32 matching lines @@
   main_frame_url = net::AppendOrReplaceQueryParameter(
       main_frame_url, "frameUrl", base::UTF16ToASCII(url_str));
   chrome::NavigateParams params(
       Profile::FromWebUI(web_ui()),
       net::AppendOrReplaceQueryParameter(main_frame_url, "constrained", "0"),
       content::PAGE_TRANSITION_AUTO_TOPLEVEL);
   chrome::Navigate(&params);
 
   web_ui()->CallJavascriptFunction("inline.login.closeDialog");
 }