chrome/browser/supervised_user/chromeos/manager_password_service.cc - Issue 1412813003: This CL replaces user_manager::UserID with AccountId.

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/supervised_user/chromeos/manager_password_service.cc

Issue 1412813003: This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names

Patch Set: Rebased. Created 5 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

« chrome/browser/signin/easy_unlock_service.cc ('K') | « chrome/browser/signin/easy_unlock_service_unittest_chromeos.cc ('k') | chrome/browser/supervised_user/supervised_user_service.cc » ('j') | chrome/browser/supervised_user/supervised_user_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/chromeos/manager_password_service.cc

diff --git a/chrome/browser/supervised_user/chromeos/manager_password_service.cc b/chrome/browser/supervised_user/chromeos/manager_password_service.cc

index 30f0a055b57fc86d51958dbe15e730fc4ad23d84..9605f96ece82334214302db05b8067c5cf670639 100644

--- a/chrome/browser/supervised_user/chromeos/manager_password_service.cc

+++ b/chrome/browser/supervised_user/chromeos/manager_password_service.cc

@@ -131,7 +131,7 @@ void ManagerPasswordService::GetSupervisedUsersCallback(

return;

}

- UserContext manager_key(user_id);

+ UserContext manager_key(AccountId::FromUserEmail(user_id));

manager_key.SetKey(Key(master_key));

manager_key.SetIsUsingOAuth(false);

@@ -240,7 +240,8 @@ void ManagerPasswordService::OnKeyTransformedIfNeeded(

void ManagerPasswordService::OnNewManagerKeySuccess(

const UserContext& master_key_context) {

- VLOG(1) << "Added new master key for " << master_key_context.GetUserID();

+ VLOG(1) << "Added new master key for "

+ << master_key_context.GetUserID().GetUserEmail();

authenticator_->RemoveKey(

master_key_context,

kLegacyCryptohomeSupervisedUserKeyLabel,

@@ -252,7 +253,7 @@ void ManagerPasswordService::OnNewManagerKeySuccess(

void ManagerPasswordService::OnOldSupervisedUserKeyDeleted(

const UserContext& master_key_context) {

VLOG(1) << "Removed old supervised user key for "

- << master_key_context.GetUserID();

+ << master_key_context.GetUserID().GetUserEmail();

authenticator_->RemoveKey(

master_key_context,

kLegacyCryptohomeMasterKeyLabel,

@@ -263,7 +264,8 @@ void ManagerPasswordService::OnOldSupervisedUserKeyDeleted(

void ManagerPasswordService::OnOldManagerKeyDeleted(

const UserContext& master_key_context) {

- VLOG(1) << "Removed old master key for " << master_key_context.GetUserID();

+ VLOG(1) << "Removed old master key for "

+ << master_key_context.GetUserID().GetUserEmail();

}

void ManagerPasswordService::Shutdown() {