chrome/browser/profiles/profile_manager.cc - Issue 777993003: Add ProfileInfoCache::ProfileIsChild/IsLegacySupervisedAtIndex.

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/profiles/profile_manager.cc

Issue 777993003: Add ProfileInfoCache::ProfileIsChild/IsLegacySupervisedAtIndex. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@unicorn_upstream

Patch Set: Created 6 years 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/profiles/profile_info_interface.h ('k') | chrome/browser/supervised_user/child_accounts/child_account_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_manager.cc

diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc

index 4a94d805dff2ad2712a170bdb35351a9d0b39e8e..f1be65da52804d981c62557c6619a6b18b7ded1c 100644

--- a/chrome/browser/profiles/profile_manager.cc

+++ b/chrome/browser/profiles/profile_manager.cc

@@ -653,7 +653,8 @@ void ProfileManager::ScheduleProfileForDeletion(

for (size_t i = 0; i < cache.GetNumberOfProfiles(); ++i) {

base::FilePath cur_path = cache.GetPathOfProfileAtIndex(i);

// Make sure that this profile is not pending deletion.

- if (cur_path != profile_dir && !cache.ProfileIsSupervisedAtIndex(i) &&

+ if (cur_path != profile_dir &&

+ !cache.ProfileIsLegacySupervisedAtIndex(i) &&

!IsProfileMarkedForDeletion(cur_path)) {

last_non_supervised_profile_path = cur_path;

break;