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

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: 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: 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..36c24effad8633818b5583bf1ec1adf370adcb64 100644
--- a/chrome/browser/sync/supervised_user_signin_manager_wrapper.cc
+++ b/chrome/browser/sync/supervised_user_signin_manager_wrapper.cc
@@ -25,12 +25,11 @@ SigninManagerBase* SupervisedUserSigninManagerWrapper::GetOriginal() {
}
std::string SupervisedUserSigninManagerWrapper::GetEffectiveUsername() const {
- const 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 {
« no previous file with comments | « chrome/browser/signin/signin_ui_util.cc ('k') | chrome/browser/ui/app_list/search/people/people_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698