chrome/browser/sync/supervised_user_signin_manager_wrapper.cc - Issue 617183003: Make sure GetAuthenticatedAccountId() returns a canonicalized id.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/supervised_user_signin_manager_wrapper.cc

Issue 617183003: Make sure GetAuthenticatedAccountId() returns a canonicalized id. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/sync/profile_sync_service_android.cc ('k') | components/enhanced_bookmarks/bookmark_server_service.cc » ('j') | components/signin/core/browser/signin_manager_base.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/supervised_user_signin_manager_wrapper.cc

diff --git a/chrome/browser/sync/supervised_user_signin_manager_wrapper.cc b/chrome/browser/sync/supervised_user_signin_manager_wrapper.cc

index 21b045ed000c636b7f2ca78e8653cffc563516af..33d87450caa2efa09f6d77259def948998d738cb 100644

--- a/chrome/browser/sync/supervised_user_signin_manager_wrapper.cc

+++ b/chrome/browser/sync/supervised_user_signin_manager_wrapper.cc

@@ -25,12 +25,12 @@ SigninManagerBase* SupervisedUserSigninManagerWrapper::GetOriginal() {

}

std::string SupervisedUserSigninManagerWrapper::GetEffectiveUsername() const {

- const std::string& auth_username = original_->GetAuthenticatedUsername();

+ std::string auth_username = original_->GetAuthenticatedUsername();

#if defined(ENABLE_MANAGED_USERS)

- if (auth_username.empty() && profile_->IsSupervised())

+ if (!original_->IsAuthenticated() && profile_->IsSupervised())

return supervised_users::kSupervisedUserPseudoEmail;

#endif

- return auth_username;

+ return original_->GetAuthenticatedUsername();

}

std::string SupervisedUserSigninManagerWrapper::GetAccountIdToUse() const {