chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.cc - Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager().

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/managed/managed_user_creation_controller_new.cc

Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix test Created 6 years, 5 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/managed/managed_user_creation_browsertest.cc ('k') | chrome/browser/chromeos/login/managed/managed_user_creation_controller_old.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.cc

diff --git a/chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.cc b/chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.cc

index f006207cb194f3114555f7bab05bd4d107615e66..20c59069c8a1d9f8f4eb72323d0e99c883d7d5dc 100644

--- a/chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.cc

+++ b/chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.cc

@@ -145,8 +145,7 @@ void ManagedUserCreationControllerNew::StartCreationImpl() {

VLOG(1) << "Starting supervised user creation";

VLOG(1) << " Phase 1 : Prepare keys";

- SupervisedUserManager* manager =

- UserManager::Get()->GetSupervisedUserManager();

+ SupervisedUserManager* manager = GetUserManager()->GetSupervisedUserManager();

manager->StartCreationTransaction(creation_context_->display_name);

creation_context_->local_user_id = manager->GenerateUserId();

@@ -165,7 +164,7 @@ void ManagedUserCreationControllerNew::StartCreationImpl() {

creation_context_->display_name);

SupervisedUserAuthentication* authentication =

- UserManager::Get()->GetSupervisedUserManager()->GetAuthentication();

+ GetUserManager()->GetSupervisedUserManager()->GetAuthentication();

// When importing M35+ users we need only to store data, for all other cases

// we need to create some keys.

@@ -363,13 +362,13 @@ void ManagedUserCreationControllerNew::OnManagedUserFilesStored(bool success) {

}

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

// sync service fails to use it.

- UserManager::Get()->SaveUserOAuthStatus(creation_context_->local_user_id,

- User::OAUTH2_TOKEN_STATUS_VALID);

+ GetUserManager()->SaveUserOAuthStatus(creation_context_->local_user_id,

+ User::OAUTH2_TOKEN_STATUS_VALID);

stage_ = TOKEN_WRITTEN;

timeout_timer_.Stop();

- UserManager::Get()->GetSupervisedUserManager()->CommitCreationTransaction();

+ GetUserManager()->GetSupervisedUserManager()->CommitCreationTransaction();

content::RecordAction(

base::UserMetricsAction("ManagedMode_LocallyManagedUserCreated"));