chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.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/supervised/supervised_user_creation_screen.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: Bugfix in original easy unlock code' 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

« no previous file with comments | « chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h ('k') | chrome/browser/chromeos/login/supervised/supervised_user_login_flow.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

index 99ef7a4f2f76f6f18c735ddb55cc7a65d93158ac..81b58223a1f495a04d7dae0c003841a659648055 100644

--- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

+++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

@@ -216,22 +216,21 @@ void SupervisedUserCreationScreen::HideFlow() {

}

void SupervisedUserCreationScreen::AuthenticateManager(

- const std::string& manager_id,

+ const AccountId& manager_id,

const std::string& manager_password) {

if (manager_signin_in_progress_)

return;

manager_signin_in_progress_ = true;

UserFlow* flow = new SupervisedUserCreationFlow(manager_id);

- ChromeUserManager::Get()->SetUserFlow(AccountId::FromUserEmail(manager_id),

- flow);

+ ChromeUserManager::Get()->SetUserFlow(manager_id, flow);

// Make sure no two controllers exist at the same time.

controller_.reset();

controller_.reset(new SupervisedUserCreationControllerNew(this, manager_id));

- UserContext user_context(AccountId::FromUserEmail(manager_id));

+ UserContext user_context(manager_id);

user_context.SetKey(Key(manager_password));

ExistingUserController::current_controller()->Login(user_context,

SigninSpecifics());