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

Side by Side Diff: chrome/browser/signin/token_service.cc

Issue 19567004: Convert SigninTracker to use OAuth2TokenService notifications (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Filip's review comments Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/signin/token_service.h" 5 #include "chrome/browser/signin/token_service.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 FOR_DIAGNOSTICS_OBSERVERS( 151 FOR_DIAGNOSTICS_OBSERVERS(
152 NotifyTokenReceivedSuccess(signin_internals_util::kLSIDToken, 152 NotifyTokenReceivedSuccess(signin_internals_util::kLSIDToken,
153 credentials.lsid, true)); 153 credentials.lsid, true));
154 } 154 }
155 155
156 void TokenService::UpdateCredentialsWithOAuth2( 156 void TokenService::UpdateCredentialsWithOAuth2(
157 const GaiaAuthConsumer::ClientOAuthResult& oauth2_tokens) { 157 const GaiaAuthConsumer::ClientOAuthResult& oauth2_tokens) {
158 SaveOAuth2Credentials(oauth2_tokens); 158 SaveOAuth2Credentials(oauth2_tokens);
159 } 159 }
160 160
161 void TokenService::ClearOAuth2Credentials() {
162 token_map_.erase(GaiaConstants::kGaiaOAuth2LoginRefreshToken);
163 if (token_web_data_.get()) {
164 token_web_data_->RemoveTokenForService(
165 GaiaConstants::kGaiaOAuth2LoginRefreshToken);
166 }
167
168 FOR_DIAGNOSTICS_OBSERVERS(
169 NotifyClearStoredToken(GaiaConstants::kGaiaOAuth2LoginRefreshToken));
170
171 FireTokenRequestFailedNotification(
172 GaiaConstants::kGaiaOAuth2LoginRefreshToken,
173 GoogleServiceAuthError(GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS));
174 }
175
161 void TokenService::LoadTokensFromDB() { 176 void TokenService::LoadTokensFromDB() {
162 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 177 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
163 if (token_web_data_.get()) 178 if (token_web_data_.get())
164 token_loading_query_ = token_web_data_->GetAllTokens(this); 179 token_loading_query_ = token_web_data_->GetAllTokens(this);
165 } 180 }
166 181
167 void TokenService::SaveAuthTokenToDB(const std::string& service, 182 void TokenService::SaveAuthTokenToDB(const std::string& service,
168 const std::string& auth_token) { 183 const std::string& auth_token) {
169 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 184 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
170 if (token_web_data_.get()) 185 if (token_web_data_.get())
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 458
444 void TokenService::AddSigninDiagnosticsObserver( 459 void TokenService::AddSigninDiagnosticsObserver(
445 SigninDiagnosticsObserver* observer) { 460 SigninDiagnosticsObserver* observer) {
446 signin_diagnostics_observers_.AddObserver(observer); 461 signin_diagnostics_observers_.AddObserver(observer);
447 } 462 }
448 463
449 void TokenService::RemoveSigninDiagnosticsObserver( 464 void TokenService::RemoveSigninDiagnosticsObserver(
450 SigninDiagnosticsObserver* observer) { 465 SigninDiagnosticsObserver* observer) {
451 signin_diagnostics_observers_.RemoveObserver(observer); 466 signin_diagnostics_observers_.RemoveObserver(observer);
452 } 467 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698