Implement new password separated sign in flow for chrome desktop.

google_apis/gaia/gaia_urls.cc

 // Copyright (c) 2012 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 "google_apis/gaia/gaia_urls.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "google_apis/gaia/gaia_switches.h"
@@ skipping 14 matching lines @@
 const char kServiceLogoutUrlSuffix[] = "Logout";
 const char kIssueAuthTokenUrlSuffix[] = "IssueAuthToken";
 const char kGetUserInfoUrlSuffix[] = "GetUserInfo";
 const char kTokenAuthUrlSuffix[] = "TokenAuth";
 const char kMergeSessionUrlSuffix[] = "MergeSession";
 const char kOAuthGetAccessTokenUrlSuffix[] = "OAuthGetAccessToken";
 const char kOAuthWrapBridgeUrlSuffix[] = "OAuthWrapBridge";
 const char kOAuth1LoginUrlSuffix[] = "OAuthLogin";
 const char kOAuthRevokeTokenUrlSuffix[] = "AuthSubRevokeToken";
 const char kListAccountsSuffix[] = "ListAccounts?json=standard";
-const char kEmbeddedSigninSuffix[] = "EmbeddedSignIn";
+const char kPasswordCombinedEmbeddedSigninSuffix[] = "EmbeddedSignIn";
+const char kEmbeddedSigninSuffix[] = "embedded/setup/chrome/usermenu";
 const char kAddAccountSuffix[] = "AddSession";
 const char kGetCheckConnectionInfoSuffix[] = "GetCheckConnectionInfo";
 
 // API calls from accounts.google.com (LSO)
 const char kGetOAuthTokenUrlSuffix[] = "o/oauth/GetOAuthToken/";
 const char kClientLoginToOAuth2UrlSuffix[] = "o/oauth2/programmatic_auth";
 const char kOAuth2AuthUrlSuffix[] = "o/oauth2/auth";
 const char kOAuth2RevokeUrlSuffix[] = "o/oauth2/revoke";
 const char kOAuth2IFrameUrlSuffix[] = "o/oauth2/iframerpc";
 
@@ skipping 58 matching lines @@
   issue_auth_token_url_ = gaia_url_.Resolve(kIssueAuthTokenUrlSuffix);
   get_user_info_url_ = gaia_url_.Resolve(kGetUserInfoUrlSuffix);
   token_auth_url_ = gaia_url_.Resolve(kTokenAuthUrlSuffix);
   merge_session_url_ = gaia_url_.Resolve(kMergeSessionUrlSuffix);
   oauth_get_access_token_url_ =
       gaia_url_.Resolve(kOAuthGetAccessTokenUrlSuffix);
   oauth_wrap_bridge_url_ = gaia_url_.Resolve(kOAuthWrapBridgeUrlSuffix);
   oauth_revoke_token_url_ = gaia_url_.Resolve(kOAuthRevokeTokenUrlSuffix);
   oauth1_login_url_ = gaia_url_.Resolve(kOAuth1LoginUrlSuffix);
   list_accounts_url_ = gaia_url_.Resolve(kListAccountsSuffix);
+  password_combined_embedded_signin_url_ =
+      gaia_url_.Resolve(kPasswordCombinedEmbeddedSigninSuffix);
   embedded_signin_url_ = gaia_url_.Resolve(kEmbeddedSigninSuffix);
   add_account_url_ = gaia_url_.Resolve(kAddAccountSuffix);
   get_check_connection_info_url_ =
       gaia_url_.Resolve(kGetCheckConnectionInfoSuffix);
 
   // URLs from accounts.google.com (LSO).
   get_oauth_token_url_ = lso_origin_url_.Resolve(kGetOAuthTokenUrlSuffix);
   client_login_to_oauth2_url_ =
       lso_origin_url_.Resolve(kClientLoginToOAuth2UrlSuffix);
   oauth2_auth_url_ = lso_origin_url_.Resolve(kOAuth2AuthUrlSuffix);
@@ skipping 90 matching lines @@
 }
 
 const GURL& GaiaUrls::oauth1_login_url() const {
   return oauth1_login_url_;
 }
 
 const GURL& GaiaUrls::embedded_signin_url() const {
   return embedded_signin_url_;
 }
 
+const GURL& GaiaUrls::password_combined_embedded_signin_url() const {
+  return password_combined_embedded_signin_url_;
+}
+
 const GURL& GaiaUrls::add_account_url() const {
   return add_account_url_;
 }
 
 const std::string& GaiaUrls::oauth2_chrome_client_id() const {
   return oauth2_chrome_client_id_;
 }
 
 const std::string& GaiaUrls::oauth2_chrome_client_secret() const {
   return oauth2_chrome_client_secret_;
@@ skipping 47 matching lines @@
   return source.empty()
       ? get_check_connection_info_url_
       : get_check_connection_info_url_.Resolve(
             base::StringPrintf("?source=%s", source.c_str()));
 }
 
 GURL GaiaUrls::signin_completed_continue_url() const {
   return
       GURL("chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik/success.html");
 }