chrome/browser/supervised_user/chromeos/manager_password_service.cc - Issue 393343002: Rename "managed (mode|user)" to "supervised user" (part 7)

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 393343002: Rename "managed (mode|user)" to "supervised user" (part 7) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: more alphabetize (and rebase again) 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/signin/chrome_signin_client.cc ('k') | chrome/browser/supervised_user/chromeos/supervised_user_password_service.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 000911af5f5b9593135ec867c8d7cf8a9b638a6b..ece93d4f798e2fcb6268341000e41b4030cd9ac8 100644

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

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

@@ -8,8 +8,8 @@

#include "base/logging.h"

#include "base/metrics/histogram.h"

#include "base/values.h"

-#include "chrome/browser/chromeos/login/managed/locally_managed_user_constants.h"

-#include "chrome/browser/chromeos/login/managed/supervised_user_authentication.h"

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

+#include "chrome/browser/chromeos/login/supervised/supervised_user_constants.h"

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

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

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

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

const UserList& users = user_manager->GetUsers();

for (UserList::const_iterator it = users.begin(); it != users.end(); ++it) {

- if ((*it)->GetType() != user_manager::USER_TYPE_LOCALLY_MANAGED)

+ if ((*it)->GetType() != user_manager::USER_TYPE_SUPERVISED)

continue;

if (user_id != supervised_user_manager->GetManagerUserId((*it)->email()))

continue;