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

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

Issue 617183003: Make sure GetAuthenticatedAccountId() returns a canonicalized id. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 6 years, 2 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: components/signin/core/browser/signin_manager.cc
diff --git a/components/signin/core/browser/signin_manager.cc b/components/signin/core/browser/signin_manager.cc
index acb32a9808def6ec666431271952264c377573b5..8376f2ebc95051d28797fdccf0a0e984daf61dd1 100644
--- a/components/signin/core/browser/signin_manager.cc
+++ b/components/signin/core/browser/signin_manager.cc
@@ -83,9 +83,8 @@ void SigninManager::RemoveMergeSessionObserver(
SigninManager::~SigninManager() {}
void SigninManager::InitTokenService() {
- const std::string& account_id = GetAuthenticatedUsername();
- if (token_service_ && !account_id.empty())
- token_service_->LoadCredentials(account_id);
+ if (token_service_ && IsAuthenticated())
+ token_service_->LoadCredentials(GetAuthenticatedAccountId());
}
std::string SigninManager::SigninTypeToString(SigninManager::SigninType type) {
@@ -207,7 +206,7 @@ void SigninManager::SignOut(
const base::Time signin_time =
base::Time::FromInternalValue(
client_->GetPrefs()->GetInt64(prefs::kSignedInTime));
- clear_authenticated_username();
+ ClearAuthenticatedUsername();
client_->GetPrefs()->ClearPref(prefs::kGoogleServicesHostedDomain);
client_->GetPrefs()->ClearPref(prefs::kGoogleServicesUsername);
client_->GetPrefs()->ClearPref(prefs::kSignedInTime);
@@ -358,12 +357,12 @@ void SigninManager::CompletePendingSignin() {
DCHECK(!temp_refresh_token_.empty());
DCHECK(IsAuthenticated());
- token_service_->UpdateCredentials(GetAuthenticatedUsername(),
- temp_refresh_token_);
+ std::string account_id = GetAuthenticatedAccountId();
+ token_service_->UpdateCredentials(account_id, temp_refresh_token_);
temp_refresh_token_.clear();
if (client_->ShouldMergeSigninCredentialsIntoCookieJar())
- merge_session_helper_->LogIn(GetAuthenticatedUsername());
+ merge_session_helper_->LogIn(account_id);
}
void SigninManager::OnExternalSigninCompleted(const std::string& username) {
« no previous file with comments | « components/signin/core/browser/profile_oauth2_token_service.cc ('k') | components/signin/core/browser/signin_manager_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698