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

Unified Diff: extensions/browser/api/management/management_api.cc

Issue 903453002: Policy: check MustRemainInstalled in addition to UserMayModifySettings before offering uninstall (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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/ui/views/apps/app_info_dialog/app_info_footer_panel.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/api/management/management_api.cc
diff --git a/extensions/browser/api/management/management_api.cc b/extensions/browser/api/management/management_api.cc
index fbfed8d3d549b198887ed3a58a1e2855ae2ddf82..08700dcb03051187679643862e9563d436aaac08 100644
--- a/extensions/browser/api/management/management_api.cc
+++ b/extensions/browser/api/management/management_api.cc
@@ -514,9 +514,10 @@ bool ManagementUninstallFunctionBase::Uninstall(
return false;
}
- if (!ExtensionSystem::Get(browser_context())
- ->management_policy()
- ->UserMayModifySettings(target_extension, NULL)) {
+ ManagementPolicy* policy =
+ ExtensionSystem::Get(browser_context())->management_policy();
+ if (!policy->UserMayModifySettings(target_extension, nullptr) ||
+ policy->MustRemainInstalled(target_extension, nullptr)) {
error_ = ErrorUtils::FormatErrorMessage(keys::kUserCantModifyError,
extension_id_);
return false;
« no previous file with comments | « chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698