diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/net/gaia/token_service.cc | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/net/gaia/token_service.cc')
| -rw-r--r-- | chrome/browser/net/gaia/token_service.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/chrome/browser/net/gaia/token_service.cc b/chrome/browser/net/gaia/token_service.cc index 963b546..a2c4cfe 100644 --- a/chrome/browser/net/gaia/token_service.cc +++ b/chrome/browser/net/gaia/token_service.cc @@ -17,8 +17,13 @@ // Unfortunately kNumServices must be defined in the .h. // TODO(chron): Sync doesn't use the TalkToken anymore so we can stop // requesting it. -const char* TokenService::kServices[] = {GaiaConstants::kSyncService, - GaiaConstants::kTalkService}; +const char* TokenService::kServices[] = { + GaiaConstants::kGaiaService, + GaiaConstants::kSyncService, + GaiaConstants::kTalkService, + GaiaConstants::kDeviceManagementService +}; + TokenService::TokenService() : token_loading_query_(0) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); @@ -184,7 +189,7 @@ void TokenService::IssueAuthTokenForTest(const std::string& service, void TokenService::OnIssueAuthTokenSuccess(const std::string& service, const std::string& auth_token) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - LOG(INFO) << "Got an authorization token for " << service; + VLOG(1) << "Got an authorization token for " << service; token_map_[service] = auth_token; FireTokenAvailableNotification(service, auth_token); SaveAuthTokenToDB(service, auth_token); @@ -237,8 +242,7 @@ void TokenService::LoadTokensIntoMemory( db_tokens.count(kServices[i])) { std::string db_token = db_tokens.find(kServices[i])->second; if (!db_token.empty()) { - LOG(INFO) << "Loading " << kServices[i] << "token from DB:" - << db_token; + VLOG(1) << "Loading " << kServices[i] << "token from DB: " << db_token; (*in_memory_tokens)[kServices[i]] = db_token; FireTokenAvailableNotification(kServices[i], db_token); // Failures are only for network errors. |