summaryrefslogtreecommitdiffstats
path: root/google_apis
diff options
context:
space:
mode:
authorrogerta <rogerta@chromium.org>2015-07-25 07:47:29 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-25 14:48:19 +0000
commitce8820ca9f57406653a5983b0cd5bf4e5a60d390 (patch)
tree4da8de5b06f1e2a4a7fba5b4c5e1f7566a065748 /google_apis
parent4997ce8c4264d7572a58b5a2757b01e97baefb89 (diff)
downloadchromium_src-ce8820ca9f57406653a5983b0cd5bf4e5a60d390.zip
chromium_src-ce8820ca9f57406653a5983b0cd5bf4e5a60d390.tar.gz
chromium_src-ce8820ca9f57406653a5983b0cd5bf4e5a60d390.tar.bz2
Perform online reauth when password is changed for a locked profile.
BUG=472596 Review URL: https://codereview.chromium.org/1220843003 Cr-Commit-Position: refs/heads/master@{#340411}
Diffstat (limited to 'google_apis')
-rw-r--r--google_apis/gaia/fake_gaia.cc2
-rw-r--r--google_apis/gaia/gaia_urls.cc5
-rw-r--r--google_apis/gaia/gaia_urls.h3
3 files changed, 9 insertions, 1 deletions
diff --git a/google_apis/gaia/fake_gaia.cc b/google_apis/gaia/fake_gaia.cc
index 2d3ff92..6749393 100644
--- a/google_apis/gaia/fake_gaia.cc
+++ b/google_apis/gaia/fake_gaia.cc
@@ -577,7 +577,7 @@ void FakeGaia::HandleEmbeddedLookupAccountLookup(
url = net::AppendQueryParameter(url, "SAMLRequest", "fake_request");
url = net::AppendQueryParameter(
url, "RelayState",
- "chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik/success.html");
+ GaiaUrls::GetInstance()->signin_completed_continue_url().spec());
std::string redirect_url = url.spec();
http_response->AddCustomHeader("Google-Accounts-SAML", "Start");
diff --git a/google_apis/gaia/gaia_urls.cc b/google_apis/gaia/gaia_urls.cc
index 0d1619e..8481e7c 100644
--- a/google_apis/gaia/gaia_urls.cc
+++ b/google_apis/gaia/gaia_urls.cc
@@ -283,3 +283,8 @@ GURL GaiaUrls::GetCheckConnectionInfoURLWithSource(const std::string& source) {
: 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");
+}
diff --git a/google_apis/gaia/gaia_urls.h b/google_apis/gaia/gaia_urls.h
index 4db875a..07623f6 100644
--- a/google_apis/gaia/gaia_urls.h
+++ b/google_apis/gaia/gaia_urls.h
@@ -53,6 +53,9 @@ class GaiaUrls {
GURL LogOutURLWithSource(const std::string& source);
GURL GetCheckConnectionInfoURLWithSource(const std::string& source);
+ // Continue URL used to signal the completion of the signin flow.
+ GURL signin_completed_continue_url() const;
+
private:
GaiaUrls();
~GaiaUrls();