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

Unified Diff: chrome/browser/chromeos/login/users/supervised_user_manager_impl.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: Update after review. 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

« chrome/browser/chromeos/login/users/mock_user_manager.cc ('K') | « chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc ('k') | chrome/browser/chromeos/login/users/user_manager_interface.h » ('j') | chrome/browser/chromeos/login/users/user_manager_interface.h » ('J')
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 066846564f6db4530cfe15b60f9b36a6bf1e20d9..989c518c52ff346499bb653ba240d2b7aa8da2a7 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 @@ std::string SupervisedUserManagerImpl::GenerateUserId() {

id = base::StringPrintf(

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

counter++;

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

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

achuithb 2015/10/28 23:11:45 nullptr

Alexander Alekseev 2015/10/29 02:00:41 Done.

DCHECK(!user_exists);

if (user_exists) {

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

@@ -186,13 +186,14 @@ const user_manager::User* SupervisedUserManagerImpl::CreateUserRecord(

DCHECK(!user);

if (user)

return user;

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

+ const user_manager::User* manager =

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

CHECK(manager);

PrefService* local_state = g_browser_process->local_state();

- user_manager::User* new_user =

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

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

+ AccountId::FromUserEmail(local_user_id));

owner_->AddUserRecord(new_user);

@@ -217,7 +218,8 @@ const user_manager::User* SupervisedUserManagerImpl::CreateUserRecord(

manager_email_update->SetWithoutPathExpansion(local_user_id,

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

- owner_->SaveUserDisplayName(local_user_id, display_name);

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

+ display_name);

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

return new_user;

@@ -442,7 +444,7 @@ void SupervisedUserManagerImpl::RollbackUserCreationTransaction() {

prefs->CommitPendingWrite();

return;

}

- owner_->RemoveNonOwnerUserInternal(user_id, NULL);

+ owner_->RemoveNonOwnerUserInternal(AccountId::FromUserEmail(user_id), NULL);

achuithb 2015/10/28 23:11:45 nullptr

Alexander Alekseev 2015/10/29 02:00:41 Done.

prefs->ClearPref(kSupervisedUserCreationTransactionDisplayName);

prefs->ClearPref(kSupervisedUserCreationTransactionUserId);