chrome/browser/chromeos/login/users/supervised_user_manager_impl.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/users/supervised_user_manager_impl.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/users/multi_profile_user_controller_unittest.cc ('k') | chrome/browser/chromeos/login/users/user_manager_interface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc

diff --git a/chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc b/chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc

index c54efe2c8fe567210632da9eb4565b836f2046c4..066846564f6db4530cfe15b60f9b36a6bf1e20d9 100644

--- a/chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc

+++ b/chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc

@@ -149,7 +149,7 @@

id = base::StringPrintf(

"%d@%s", counter, chromeos::login::kSupervisedUserDomain);

counter++;

- user_exists = (nullptr != owner_->FindUser(AccountId::FromUserEmail(id)));

+ user_exists = (NULL != owner_->FindUser(id));

DCHECK(!user_exists);

if (user_exists) {

LOG(ERROR) << "Supervised user with id " << id << " already exists.";

@@ -186,14 +186,13 @@

DCHECK(!user);

if (user)

return user;

- const user_manager::User* manager =

- owner_->FindUser(AccountId::FromUserEmail(manager_id));

+ const user_manager::User* manager = owner_->FindUser(manager_id);

CHECK(manager);

PrefService* local_state = g_browser_process->local_state();

- user_manager::User* new_user = user_manager::User::CreateSupervisedUser(

- AccountId::FromUserEmail(local_user_id));

+ user_manager::User* new_user =

+ user_manager::User::CreateSupervisedUser(local_user_id);

owner_->AddUserRecord(new_user);

@@ -218,8 +217,7 @@

manager_email_update->SetWithoutPathExpansion(local_user_id,

new base::StringValue(manager->display_email()));

- owner_->SaveUserDisplayName(AccountId::FromUserEmail(local_user_id),

- display_name);

+ owner_->SaveUserDisplayName(local_user_id, display_name);

g_browser_process->local_state()->CommitPendingWrite();

return new_user;

@@ -444,8 +442,7 @@

prefs->CommitPendingWrite();

return;

}

- owner_->RemoveNonOwnerUserInternal(AccountId::FromUserEmail(user_id),

- nullptr);

+ owner_->RemoveNonOwnerUserInternal(user_id, NULL);

prefs->ClearPref(kSupervisedUserCreationTransactionDisplayName);

prefs->ClearPref(kSupervisedUserCreationTransactionUserId);