chrome/browser/chromeos/login/users/user_manager_impl.cc - Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2)

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/users/user_manager_impl.cc

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: similarity 25 Created 6 years, 6 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:

Index: chrome/browser/chromeos/login/users/user_manager_impl.cc

diff --git a/chrome/browser/chromeos/login/users/user_manager_impl.cc b/chrome/browser/chromeos/login/users/user_manager_impl.cc

index a776a12146dafe6404cdeb3a842cd071da17c055..b9a4f4210adbed9f06bc926bd4c3a83303354ff0 100644

--- a/chrome/browser/chromeos/login/users/user_manager_impl.cc

+++ b/chrome/browser/chromeos/login/users/user_manager_impl.cc

@@ -52,12 +52,12 @@

#include "chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.h"

#include "chrome/browser/chromeos/profiles/profile_helper.h"

#include "chrome/browser/chromeos/session_length_limiter.h"

-#include "chrome/browser/managed_mode/chromeos/managed_user_password_service_factory.h"

-#include "chrome/browser/managed_mode/chromeos/manager_password_service_factory.h"

#include "chrome/browser/net/nss_context.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/profiles/profiles_state.h"

+#include "chrome/browser/supervised_user/chromeos/manager_password_service_factory.h"

+#include "chrome/browser/supervised_user/chromeos/supervised_user_password_service_factory.h"

#include "chrome/browser/sync/profile_sync_service.h"

#include "chrome/browser/sync/profile_sync_service_factory.h"

#include "chrome/common/chrome_constants.h"

@@ -939,7 +939,7 @@ void UserManagerImpl::Observe(int type,

!IsLoggedInAsGuest() &&

!IsLoggedInAsKioskApp()) {

if (IsLoggedInAsLocallyManagedUser())

- ManagedUserPasswordServiceFactory::GetForProfile(profile);

+ SupervisedUserPasswordServiceFactory::GetForProfile(profile);

if (IsLoggedInAsRegularUser())

ManagerPasswordServiceFactory::GetForProfile(profile);