chrome/browser/supervised_user/supervised_user_service.cc - Issue 353493002: Apps&Extensions for supervised users: Add Extension::WAS_INSTALLED_BY_CUSTODIAN flag and proto entry

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

Issue 353493002: Apps&Extensions for supervised users: Add Extension::WAS_INSTALLED_BY_CUSTODIAN flag and proto entry (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: update test 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:

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

Download patch

« no previous file with comments | « chrome/browser/extensions/pending_extension_manager.cc ('k') | chrome/browser/themes/theme_syncable_service.cc » ('j') | chrome/browser/themes/theme_syncable_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/supervised_user_service.cc

diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc

index d20661e188a24eec667de6de45cfccf137d5a9db..2bb97cec27411a4825e0cf9814aba825f7f657a2 100644

--- a/chrome/browser/supervised_user/supervised_user_service.cc

+++ b/chrome/browser/supervised_user/supervised_user_service.cc

@@ -298,6 +298,7 @@ bool SupervisedUserService::UserMayLoad(const extensions::Extension* extension,

return true;

bool was_installed_by_default = extension->was_installed_by_default();

+ bool was_installed_by_custodian = extension->was_installed_by_custodian();

#if defined(OS_CHROMEOS)

// On Chrome OS all external sources are controlled by us so it means that

// they are "default". Method was_installed_by_default returns false because

@@ -309,7 +310,8 @@ bool SupervisedUserService::UserMayLoad(const extensions::Extension* extension,

extensions::Manifest::IsExternalLocation(extension->location());

#endif

if (extension->location() == extensions::Manifest::COMPONENT ||

- was_installed_by_default) {

+ was_installed_by_default ||

+ was_installed_by_custodian) {

return true;

}