chrome/browser/chromeos/login/managed/supervised_user_authentication.cc - Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2)

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/chromeos/login/managed/supervised_user_authentication.cc

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review comments (+ a few other cleanups) Created 6 years, 6 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/chromeos/login/managed/managed_user_test_base.cc ('k') | chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/managed/supervised_user_authentication.cc

diff --git a/chrome/browser/chromeos/login/managed/supervised_user_authentication.cc b/chrome/browser/chromeos/login/managed/supervised_user_authentication.cc

index ebec8a4647aa2174f78ae1fd9572b38bcade525c..968bc18d57faba9c098808f67d6d13d3b6169945 100644

--- a/chrome/browser/chromeos/login/managed/supervised_user_authentication.cc

+++ b/chrome/browser/chromeos/login/managed/supervised_user_authentication.cc

@@ -116,7 +116,7 @@ UserContext SupervisedUserAuthentication::TransformKey(

DCHECK(!salt.empty());

Key* const key = result.GetKey();

key->Transform(Key::KEY_TYPE_SALTED_PBKDF2_AES256_1234, salt);

- key->SetLabel(kCryptohomeManagedUserKeyLabel);

+ key->SetLabel(kCryptohomeSupervisedUserKeyLabel);

result.SetIsUsingOAuth(false);

return result;

}