chrome/browser/chromeos/login/session/session_manager.cc - Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1)

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/session/session_manager.cc

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

Patch Set: rebase 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/session/session_manager.cc

diff --git a/chrome/browser/chromeos/login/session/session_manager.cc b/chrome/browser/chromeos/login/session/session_manager.cc

index 14af5a6006506f395b5fbad0c5fef61a323e77db..b54c7c004b2f370669f064d8e6c9d1d818ee6692 100644

--- a/chrome/browser/chromeos/login/session/session_manager.cc

+++ b/chrome/browser/chromeos/login/session/session_manager.cc

@@ -379,7 +379,8 @@ void SessionManager::InitProfilePreferences(Profile* profile,

std::string managed_user_sync_id =

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

GetUserSyncId(active_user->email());

- profile->GetPrefs()->SetString(prefs::kManagedUserId, managed_user_sync_id);

+ profile->GetPrefs()->SetString(prefs::kSupervisedUserId,

+ managed_user_sync_id);

} else if (UserManager::Get()->IsLoggedInAsRegularUser()) {

// Make sure that the google service username is properly set (we do this

// on every sign in, not just the first login, to deal with existing