chrome/browser/supervised_user/child_accounts/child_account_service.cc - Issue 2945023002: Introduce profile for lock screen apps

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/child_accounts/child_account_service.cc

Issue 2945023002: Introduce profile for lock screen apps (Closed)

Patch Set: rebase Created 3 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/signin/easy_unlock_service_factory.cc ('k') | chrome/browser/ui/app_list/app_list_syncable_service_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/child_accounts/child_account_service.cc

diff --git a/chrome/browser/supervised_user/child_accounts/child_account_service.cc b/chrome/browser/supervised_user/child_accounts/child_account_service.cc

index 8fefedcb91dc049739d075557fbd0dccb0c9b595..842021e07068f80fb0a931a234c11ba2066659dc 100644

--- a/chrome/browser/supervised_user/child_accounts/child_account_service.cc

+++ b/chrome/browser/supervised_user/child_accounts/child_account_service.cc

@@ -363,10 +363,13 @@ void ChildAccountService::PropagateChildStatusToUser(bool is_child) {

#if defined(OS_CHROMEOS)

user_manager::User* user =

chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);

- if (user)

+ if (user) {

user_manager::UserManager::Get()->ChangeUserChildStatus(user, is_child);

- else if (!chromeos::ProfileHelper::Get()->IsSigninProfile(profile_))

+ } else if (!chromeos::ProfileHelper::Get()->IsSigninProfile(profile_) &&

+ !chromeos::ProfileHelper::Get()->IsLockScreenAppProfile(

+ profile_)) {

LOG(DFATAL) << "User instance not found while setting child account flag.";

+ }

#endif

}