chrome/browser/chromeos/login/easy_unlock/easy_unlock_challenge_wrapper.cc - Issue 1494153002: This CL replaces e-mail with AccountId in easy signin code.

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/easy_unlock/easy_unlock_challenge_wrapper.cc

Issue 1494153002: This CL replaces e-mail with AccountId in easy signin code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix build. Created 5 years 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/chromeos/login/easy_unlock/easy_unlock_challenge_wrapper.h ('K') | « chrome/browser/chromeos/login/easy_unlock/easy_unlock_challenge_wrapper.h ('k') | chrome/browser/chromeos/login/easy_unlock/easy_unlock_challenge_wrapper_unittest.cc » ('j') | chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/easy_unlock/easy_unlock_challenge_wrapper.cc

diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_challenge_wrapper.cc b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_challenge_wrapper.cc

index f201e55f6e02007187318ca50d5bcaadc8112415..953aae4eb17762db7dd422c7b008878038279b79 100644

--- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_challenge_wrapper.cc

+++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_challenge_wrapper.cc

@@ -23,11 +23,11 @@ const char kSalt[] =

EasyUnlockChallengeWrapper::EasyUnlockChallengeWrapper(

const std::string& challenge,

const std::string& channel_binding_data,

- const std::string& user_id,

+ const AccountId& account_id,

EasyUnlockTpmKeyManager* key_manager)

: challenge_(challenge),

channel_binding_data_(channel_binding_data),

- user_id_(user_id),

+ account_id_(account_id),

key_manager_(key_manager),

weak_ptr_factory_(this) {}

@@ -62,7 +62,7 @@ void EasyUnlockChallengeWrapper::WrapChallenge(

void EasyUnlockChallengeWrapper::SignUsingTpmKey(

const std::string& data_to_sign,

const base::Callback<void(const std::string&)>& callback) {

- key_manager_->SignUsingTpmKey(user_id_, data_to_sign, callback);

+ key_manager_->SignUsingTpmKey(account_id_, data_to_sign, callback);

}

void EasyUnlockChallengeWrapper::OnChannelBindingDataSigned(