Allow enhanced bookmarks external component extensions to be disabled

chrome/browser/extensions/standard_management_policy_provider.cc

Index: chrome/browser/extensions/standard_management_policy_provider.cc
diff --git a/chrome/browser/extensions/standard_management_policy_provider.cc b/chrome/browser/extensions/standard_management_policy_provider.cc
index c9b9e4f096f71b889fa133a242812979cba8789d..b2228d416cbbbc25e26632a9604a891a415e68e2 100644
--- a/chrome/browser/extensions/standard_management_policy_provider.cc
+++ b/chrome/browser/extensions/standard_management_policy_provider.cc
@@ -6,6 +6,7 @@
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/extensions/blacklist.h"
+#include "chrome/browser/extensions/external_component_loader.h"
 #include "chrome/common/pref_names.h"
 #include "extensions/browser/admin_policy.h"
 #include "extensions/browser/extension_prefs.h"
@@ -54,13 +55,15 @@ bool StandardManagementPolicyProvider::UserMayLoad(
 bool StandardManagementPolicyProvider::UserMayModifySettings(
     const Extension* extension,
     base::string16* error) const {
-  return admin_policy::UserMayModifySettings(extension, error);
+  return admin_policy::UserMayModifySettings(extension, error) ||
+      ExternalComponentLoader::IsModifiable(extension);
 }
 
 bool StandardManagementPolicyProvider::MustRemainEnabled(
     const Extension* extension,
     base::string16* error) const {
-  return admin_policy::MustRemainEnabled(extension, error);
+  return admin_policy::MustRemainEnabled(extension, error) ||
+      ExternalComponentLoader::IsModifiable(extension);
 }

[asargent_no_longer_on_chrome, 2014/08/12 23:27:35]

nit: can you add the check for extension->location() ==
Manifest::EXTERNAL_COMPONENT here as well?

[Mike Wittman, 2014/08/13 01:25:12]

Done.

 
 }  // namespace extensions