chrome/browser/supervised_user/chromeos/manager_password_service.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/supervised_user/chromeos/manager_password_service.cc

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

Patch Set: rebase 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

« chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc ('K') | « chrome/browser/signin/signin_error_notifier_ash.cc ('k') | chrome/browser/supervised_user/chromeos/manager_password_service_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/chromeos/manager_password_service.cc

diff --git a/chrome/browser/supervised_user/chromeos/manager_password_service.cc b/chrome/browser/supervised_user/chromeos/manager_password_service.cc

index 02c195596f050eaa065bece847e84510a53d3540..f45e2325a0c5ee108a8c5a4d1414e6d3d38ea7e4 100644

--- a/chrome/browser/supervised_user/chromeos/manager_password_service.cc

+++ b/chrome/browser/supervised_user/chromeos/manager_password_service.cc

@@ -38,7 +38,7 @@ void ManagerPasswordService::Init(

authenticator_ = new ExtendedAuthenticator(this);

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

+ UserManager* user_manager = GetUserManager();

SupervisedUserManager* supervised_user_manager =

user_manager->GetSupervisedUserManager();

@@ -63,7 +63,7 @@ void ManagerPasswordService::OnSharedSettingsChange(

return;

SupervisedUserManager* supervised_user_manager =

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

+ GetUserManager()->GetSupervisedUserManager();

const User* user = supervised_user_manager->FindBySyncId(su_id);

// No user on device.

if (user == NULL)

@@ -196,7 +196,7 @@ void ManagerPasswordService::OnAddKeySuccess(

SupervisedUserAuthentication::PASSWORD_CHANGE_RESULT_MAX_VALUE);

SupervisedUserAuthentication* auth =

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

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

int old_schema = auth->GetPasswordSchema(user_id);

auth->StorePasswordData(user_id, *password_data.get());