chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc - Issue 718673002: New user type introduced. Combines regular and supervised features.

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

Issue 718673002: New user type introduced. Combines regular and supervised features. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Logical expression fixed. Created 6 years, 1 month 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/avatar/user_image_manager_impl.h ('K') | « chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc ('k') | chrome/browser/chromeos/login/users/fake_user_manager.h » ('j') | chrome/browser/chromeos/policy/device_status_collector.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 4a682dec9eaf6d940959d819cbafeb62c2b8e55e..a371c90310074a0bd29f1e6f1a58bb87bf9087f1 100644

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

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

@@ -355,7 +355,7 @@ void ChromeUserManagerImpl::Observe(

if (IsUserLoggedIn() && !IsLoggedInAsGuest() && !IsLoggedInAsKioskApp()) {

if (IsLoggedInAsSupervisedUser())

SupervisedUserPasswordServiceFactory::GetForProfile(profile);

- if (IsLoggedInAsRegularUser())

+ if (IsLoggedInAsUserWithGaiaAccount())

ManagerPasswordServiceFactory::GetForProfile(profile);

if (!profile->IsOffTheRecord()) {

@@ -583,8 +583,7 @@ void ChromeUserManagerImpl::RetrieveTrustedDevicePolicies() {

for (user_manager::UserList::iterator it = users_.begin();

it != users_.end();) {

const std::string user_email = (*it)->email();

- if ((*it)->GetType() == user_manager::USER_TYPE_REGULAR &&

- user_email != GetOwnerEmail()) {

+ if ((*it)->HasGaiaAccount() && user_email != GetOwnerEmail()) {

RemoveNonCryptohomeData(user_email);

DeleteUser(*it);

it = users_.erase(it);