chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.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/locally_managed_user_creation_screen.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/login_utils_browsertest.cc ('k') | chrome/browser/chromeos/login/managed/managed_user_creation_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index dab0a79ab259d2ecaecf5f3351f99b222569c9ae..4a01754397136313e0024179fa30709f87fa523f 100644

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

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

@@ -196,7 +196,7 @@ void LocallyManagedUserCreationScreen::AuthenticateManager(

// Make sure no two controllers exist at the same time.

controller_.reset();

SupervisedUserAuthentication* authentication =

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

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

if (authentication->GetStableSchema() ==

SupervisedUserAuthentication::SCHEMA_PLAIN) {

@@ -451,7 +451,7 @@ bool LocallyManagedUserCreationScreen::FindUserByDisplayName(

void LocallyManagedUserCreationScreen::ApplyPicture() {

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

- UserManager* user_manager = UserManager::Get();

+ UserManager* user_manager = GetUserManager();

UserImageManager* image_manager = user_manager->GetUserImageManager(user_id);

switch (selected_image_) {

case User::kExternalImageIndex:

@@ -489,7 +489,7 @@ void LocallyManagedUserCreationScreen::OnGetManagedUsers(

// Copy for passing to WebUI, contains only id, name and avatar URL.

scoped_ptr<base::ListValue> ui_users(new base::ListValue());

SupervisedUserManager* supervised_user_manager =

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

+ GetUserManager()->GetSupervisedUserManager();

// Stored copy, contains all necessary information.

existing_users_.reset(new base::DictionaryValue());