chrome/browser/supervised_user/chromeos/supervised_user_password_service.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

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/supervised_user_password_service.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: similarity Created 6 years, 4 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/wallpaper/wallpaper_manager.cc ('K') | « chrome/browser/supervised_user/chromeos/manager_password_service_factory.cc ('k') | chrome/browser/supervised_user/chromeos/supervised_user_password_service_factory.cc » ('j') | chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index c3dc5d0f8a40643aed5ba583a9aaff45bc44f65b..434b0bd94d6dc9a1afdad4914003d74e99456162 100644

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

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

@@ -7,10 +7,11 @@

#include "base/bind.h"

#include "base/values.h"

#include "chrome/browser/chromeos/login/supervised/supervised_user_authentication.h"

+#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"

#include "chrome/browser/chromeos/login/users/supervised_user_manager.h"

-#include "chrome/browser/chromeos/login/users/user_manager.h"

#include "chrome/browser/supervised_user/supervised_user_constants.h"

#include "chrome/browser/supervised_user/supervised_user_sync_service.h"

+#include "components/user_manager/user_manager.h"

namespace chromeos {

@@ -31,7 +32,7 @@ void SupervisedUserPasswordService::Init(

// Force value check in case we have missed some notification.

chromeos::SupervisedUserManager* supervised_user_manager =

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

+ ChromeUserManager::Get()->GetSupervisedUserManager();

OnSharedSettingsChange(supervised_user_manager->GetUserSyncId(user_id),

supervised_users::kChromeOSPasswordData);

@@ -43,7 +44,7 @@ void SupervisedUserPasswordService::OnSharedSettingsChange(

if (key != supervised_users::kChromeOSPasswordData)

return;

chromeos::SupervisedUserManager* supervised_user_manager =

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

+ ChromeUserManager::Get()->GetSupervisedUserManager();

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

if (user == NULL) {

LOG(WARNING) << "Got notification for user not on device.";