chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.cc - Issue 1425093004: Revert of 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_controller_new.cc

Issue 1425093004: Revert of 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: Created 5 years, 2 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/supervised/supervised_user_authentication.cc ('k') | chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.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_controller_new.cc

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

index 1ad658c028568034da276714556cd664c35e6cde..0e512ffe746c3d4930f4053f505ca29f7f011f66 100644

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

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

@@ -27,7 +27,6 @@

#include "chromeos/dbus/session_manager_client.h"

#include "chromeos/login/auth/key.h"

#include "chromeos/login/auth/user_context.h"

-#include "components/signin/core/account_id/account_id.h"

#include "components/user_manager/user.h"

#include "components/user_manager/user_manager.h"

#include "content/public/browser/browser_thread.h"

@@ -288,8 +287,7 @@

std::string(), // The salt is stored elsewhere.

creation_context_->salted_master_key);

key.SetLabel(kCryptohomeMasterKeyLabel);

- UserContext context(

- AccountId::FromUserEmail(creation_context_->local_user_id));

+ UserContext context(creation_context_->local_user_id);

context.SetKey(key);

context.SetIsUsingOAuth(false);

@@ -383,7 +381,7 @@

// Assume that new token is valid. It will be automatically invalidated if

// sync service fails to use it.

user_manager::UserManager::Get()->SaveUserOAuthStatus(

- AccountId::FromUserEmail(creation_context_->local_user_id),

+ creation_context_->local_user_id,

user_manager::User::OAUTH2_TOKEN_STATUS_VALID);

stage_ = TOKEN_WRITTEN;