Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(376)

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: rebase Created 6 years, 5 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
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 fbc44d0efc4900a3d9f715a77e1d4487adb0f200..ac7fa128b7bbb223a1171fed521defc09f8959ed 100644
--- a/chrome/browser/supervised_user/supervised_user_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_service.cc
@@ -286,6 +286,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
@@ -297,7 +298,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;
}
« no previous file with comments | « chrome/browser/extensions/pending_extension_manager.cc ('k') | chrome/browser/themes/theme_syncable_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698