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

Unified Diff: chrome/browser/invalidation/profile_invalidation_auth_provider.cc

Issue 196783002: Export a private webstore API to call into the new inline sign-in flow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add API tests Created 6 years, 9 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/invalidation/profile_invalidation_auth_provider.cc
diff --git a/chrome/browser/invalidation/profile_invalidation_auth_provider.cc b/chrome/browser/invalidation/profile_invalidation_auth_provider.cc
index 468520d60d69d4a67da5292a7810db0a8defcf2c..9c5b5da2b30a963697e6782bdfccafc98a5fd1ea 100644
--- a/chrome/browser/invalidation/profile_invalidation_auth_provider.cc
+++ b/chrome/browser/invalidation/profile_invalidation_auth_provider.cc
@@ -17,10 +17,13 @@ ProfileInvalidationAuthProvider::ProfileInvalidationAuthProvider(
token_service_(token_service),
login_ui_service_(login_ui_service) {
signin_manager_->AddObserver(this);
+ SigninManagerFactory::GetInstance()->AddObserver(this);
}
ProfileInvalidationAuthProvider::~ProfileInvalidationAuthProvider() {
- signin_manager_->RemoveObserver(this);
+ SigninManagerFactory::GetInstance()->RemoveObserver(this);
+ if (signin_manager_)
+ signin_manager_->RemoveObserver(this);
}
std::string ProfileInvalidationAuthProvider::GetAccountId() {
@@ -41,4 +44,12 @@ void ProfileInvalidationAuthProvider::GoogleSignedOut(
FireInvalidationAuthLogout();
}
+void ProfileInvalidationAuthProvider::SigninManagerShutdown(
+ SigninManagerBase* manager) {
+ if (manager == signin_manager_) {
+ signin_manager_->RemoveObserver(this);
+ signin_manager_ = NULL;
+ }
+}
+
} // namespace invalidation

Powered by Google App Engine
This is Rietveld 408576698