chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.cc - Issue 290483003: Tame the proliferation of UserContext constructors

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/managed_user_creation_controller_new.cc

Issue 290483003: Tame the proliferation of UserContext constructors (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased. Created 6 years, 7 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/locally_managed_user_creation_screen.cc ('k') | chrome/browser/chromeos/login/managed/supervised_user_authentication.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 86a0d49f20a3f95df8d9e2b4272dea73b0acf3d3..180ed0ac0bd3e5dd0244cda01124a3b660e4dbfe 100644

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

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

@@ -267,12 +267,11 @@ void ManagedUserCreationControllerNew::OnMountSuccess(

base::Base64Decode(creation_context_->signature_key,

&password_key.signature_key);

- UserContext context(creation_context_->local_user_id,

- creation_context_->salted_master_key,

- std::string());

- context.SetIsUsingOAuth(false);

+ UserContext context(creation_context_->local_user_id);

+ context.SetPassword(creation_context_->salted_master_key);

context.SetDoesNeedPasswordHashing(false);

context.SetKeyLabel(kCryptohomeMasterKeyLabel);

+ context.SetIsUsingOAuth(false);

authenticator_->AddKey(

context,