chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc - Issue 296773002: Add a Key class

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_login_flow.cc

Issue 296773002: Add a Key class (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/supervised_user_authentication_unittest.cc ('k') | chrome/browser/chromeos/login/signin/oauth2_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 9608dd692a5cf708ed531be3f25873650a0fe072..65a4485b64b5eed778d0e7286160a6eebc44ab7d 100644

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

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

@@ -10,6 +10,7 @@

#include "base/prefs/pref_registry_simple.h"

#include "base/prefs/pref_service.h"

#include "base/values.h"

+#include "chrome/browser/chromeos/login/auth/key.h"

#include "chrome/browser/chromeos/login/login_utils.h"

#include "chrome/browser/chromeos/login/managed/locally_managed_user_constants.h"

#include "chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.h"

@@ -146,7 +147,7 @@ void SupervisedUserLoginFlow::OnPasswordChangeDataLoaded(

key.privileges = kCryptohomeManagedUserIncompleteKeyPrivileges;

VLOG(1) << "Adding new schema key";

- DCHECK(context_.GetKeyLabel().empty());

+ DCHECK(context_.GetKey()->GetLabel().empty());

authenticator_->AddKey(context_,

key,

false /* no key exists */,

@@ -162,7 +163,7 @@ void SupervisedUserLoginFlow::OnPasswordChangeDataLoaded(

key.privileges = kCryptohomeManagedUserIncompleteKeyPrivileges;

}

// Just update the key.

- DCHECK_EQ(context_.GetKeyLabel(), kCryptohomeManagedUserKeyLabel);

+ DCHECK_EQ(context_.GetKey()->GetLabel(), kCryptohomeManagedUserKeyLabel);

authenticator_->UpdateKeyAuthorized(

context_,

key,