Index: chrome/browser/ui/webui/inline_login_ui.cc |
diff --git a/chrome/browser/ui/webui/inline_login_ui.cc b/chrome/browser/ui/webui/inline_login_ui.cc |
index cc7be52394a57634b4a1254aafe9ac5ff24d70c3..12e04ea64f29ca0e966ef9acc3e693850e893671 100644 |
--- a/chrome/browser/ui/webui/inline_login_ui.cc |
+++ b/chrome/browser/ui/webui/inline_login_ui.cc |
@@ -151,17 +151,19 @@ class InlineLoginUIHandler : public content::WebUIMessageHandler { |
const GURL& current_url = web_ui()->GetWebContents()->GetURL(); |
signin::Source source = signin::GetSourceForPromoURL(current_url); |
- // TODO(guohui): switch to the embedded gaia endpoint for avatar flows |
- // when available. |
DCHECK(source != signin::SOURCE_UNKNOWN); |
- if (source != signin::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT && |
- source != signin::SOURCE_AVATAR_BUBBLE_SIGN_IN) { |
- params.SetString("service", "chromiumsync"); |
- base::StringAppendF( |
- &encoded_continue_params, "&%s=%d", "source", |
- static_cast<int>(source)); |
+ if (source == signin::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT || |
+ source == signin::SOURCE_AVATAR_BUBBLE_SIGN_IN) { |
+ // Drop the leading slash in the path. |
+ params.SetString("gaiaPath", |
+ gaiaUrls->embedded_signin_url().path().substr(1)); |
} |
+ params.SetString("service", "chromiumsync"); |
+ base::StringAppendF( |
+ &encoded_continue_params, "&%s=%d", "source", |
+ static_cast<int>(source)); |
+ |
params.SetString("continueUrl", |
gaiaUrls->client_login_to_oauth2_url().Resolve( |
encoded_continue_params).spec()); |