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

Unified Diff: chrome/browser/extensions/extension_service.cc

Issue 405433003: Apps&Extensions for supervised users: Allow the custodian to remotely uninstall extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: other UNINSTALL_REASON_SYNC occurrences 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
« no previous file with comments | « chrome/browser/extensions/extension_service.h ('k') | chrome/browser/extensions/extension_sync_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 03d1faffd0c87fa6f704a3bb2eab9fe93431e077..6242bba481cdf52008b61673c3b6c262c6b7897b 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -699,7 +699,8 @@ bool ExtensionService::UninstallExtension(
bool external_uninstall =
(reason == UNINSTALL_REASON_INTERNAL_MANAGEMENT) ||
(reason == UNINSTALL_REASON_ORPHANED_EXTERNAL_EXTENSION) ||
- (reason == UNINSTALL_REASON_ORPHANED_SHARED_MODULE);
+ (reason == UNINSTALL_REASON_ORPHANED_SHARED_MODULE) ||
+ (reason == UNINSTALL_REASON_SYNC_BY_CUSTODIAN);
not at google - send to devlin 2014/07/18 14:45:08 Thanks for updating the other call sites. With th
not at google - send to devlin 2014/07/21 16:48:23 I guess I mean 2 things: - you could not even trig
Marc Treib 2014/07/22 09:30:07 Ah, right, that'll work, and not require changes t
if (!external_uninstall &&
!system_->management_policy()->UserMayModifySettings(
extension.get(), error)) {
« no previous file with comments | « chrome/browser/extensions/extension_service.h ('k') | chrome/browser/extensions/extension_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698