chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc - Issue 1412813003: This CL replaces user_manager::UserID with AccountId.

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 1412813003: This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names

Patch Set: Fix Win GN build. Created 5 years, 1 month 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_controller_new.cc ('k') | chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc » ('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 2648f7f26d212508c8b74a354c8ce60915990644..99ef7a4f2f76f6f18c735ddb55cc7a65d93158ac 100644

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

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

@@ -223,14 +223,15 @@ void SupervisedUserCreationScreen::AuthenticateManager(

manager_signin_in_progress_ = true;

UserFlow* flow = new SupervisedUserCreationFlow(manager_id);

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

+ ChromeUserManager::Get()->SetUserFlow(AccountId::FromUserEmail(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(manager_id);

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

user_context.SetKey(Key(manager_password));

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

SigninSpecifics());

@@ -484,7 +485,8 @@ bool SupervisedUserCreationScreen::FindUserByDisplayName(

void SupervisedUserCreationScreen::ApplyPicture() {

std::string user_id = controller_->GetSupervisedUserId();

UserImageManager* image_manager =

- ChromeUserManager::Get()->GetUserImageManager(user_id);

+ ChromeUserManager::Get()->GetUserImageManager(

+ AccountId::FromUserEmail(user_id));

switch (selected_image_) {

case user_manager::User::USER_IMAGE_EXTERNAL:

// Photo decoding may not have been finished yet.