Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4761)

Unified Diff: chrome/browser/chromeos/login/oauth2_login_verifier.h

Issue 148463004: Perform /ListAccounts check before session merge to see if there is a need for session merge at all. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/oauth2_login_verifier.h
diff --git a/chrome/browser/chromeos/login/oauth2_login_verifier.h b/chrome/browser/chromeos/login/oauth2_login_verifier.h
index 541d7e5c537af27717cbbbfb0019f4d932d3c288..e670525cb0796f79c90fc4c1224c5be76944665d 100644
--- a/chrome/browser/chromeos/login/oauth2_login_verifier.h
+++ b/chrome/browser/chromeos/login/oauth2_login_verifier.h
@@ -53,6 +53,9 @@ class OAuth2LoginVerifier : public base::SupportsWeakPtr<OAuth2LoginVerifier>,
const std::string& oauthlogin_access_token);
virtual ~OAuth2LoginVerifier();
+ // Initiates verification of GAIA cookies in |profile|'s cookie jar.
+ void VerifyUserCookies(Profile* profile);
+
// Attempts to restore session from OAuth2 refresh token minting all necesarry
// tokens along the way (OAuth2 access token, SID/LSID, GAIA service token).
void VerifyProfileTokens(Profile* profile);
@@ -94,8 +97,8 @@ class OAuth2LoginVerifier : public base::SupportsWeakPtr<OAuth2LoginVerifier>,
// hasn't stumped over SID/LSID.
void SchedulePostMergeVerification();
- // Starts post merge request verification.
- void StartPostRestoreVerification();
+ // Starts GAIA auth cookies (SID/LSID) verification.
+ void StartAuthCookiesVerification();
// Decides how to proceed on GAIA |error|. If the error looks temporary,
// retries |task| after certain delay until max retry count is reached.
@@ -104,6 +107,10 @@ class OAuth2LoginVerifier : public base::SupportsWeakPtr<OAuth2LoginVerifier>,
const base::Closure& task_to_retry,
const ErrorHandler& error_handler);
+ // Delays operation defined with |callback| based on the current networking
+ // conditions.
+ bool DelayNetworkCall(const base::Closure& callback);
+
OAuth2LoginVerifier::Delegate* delegate_;
scoped_refptr<net::URLRequestContextGetter> system_request_context_;
scoped_refptr<net::URLRequestContextGetter> user_request_context_;
« no previous file with comments | « chrome/browser/chromeos/login/oauth2_login_manager.cc ('k') | chrome/browser/chromeos/login/oauth2_login_verifier.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698