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

Unified Diff: components/signin/core/browser/account_reconcilor.cc

Issue 298753009: Clear list of pending /ListAccount callsbacks when shutting down or when (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/signin/core/browser/account_reconcilor.cc
diff --git a/components/signin/core/browser/account_reconcilor.cc b/components/signin/core/browser/account_reconcilor.cc
index 4d7cf9789b867f93ecd230d2f2f755203ae88023..65c737073da99ed03a8c65ed08eabed9af3ead86 100644
--- a/components/signin/core/browser/account_reconcilor.cc
+++ b/components/signin/core/browser/account_reconcilor.cc
@@ -237,6 +237,7 @@ void AccountReconcilor::Shutdown() {
merge_session_helper_.CancelAll();
merge_session_helper_.RemoveObserver(this);
gaia_fetcher_.reset();
+ get_gaia_accounts_callbacks_.clear();
DeleteFetchers();
UnregisterWithSigninManager();
UnregisterWithTokenService();
@@ -349,6 +350,7 @@ void AccountReconcilor::GoogleSigninSucceeded(const std::string& username,
void AccountReconcilor::GoogleSignedOut(const std::string& username) {
VLOG(1) << "AccountReconcilor::GoogleSignedOut: signed out";
gaia_fetcher_.reset();
+ get_gaia_accounts_callbacks_.clear();
AbortReconcile();
UnregisterWithTokenService();
UnregisterForCookieChanges();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698