Allow enhanced bookmarks external component extensions to be disabled

chrome/browser/extensions/standard_management_policy_provider.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/standard_management_policy_provider.h"
 
 #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"
 #include "extensions/browser/pref_names.h"
 #include "extensions/common/extension.h"
 
 namespace extensions {
 
 StandardManagementPolicyProvider::StandardManagementPolicyProvider(
     ExtensionPrefs* prefs)
@@ skipping 28 matching lines @@
   if (pref_service->HasPrefPath(pref_names::kAllowedTypes))
     allowed_types = pref_service->GetList(pref_names::kAllowedTypes);
 
   return admin_policy::UserMayLoad(
       blacklist, whitelist, forcelist, allowed_types, extension, error);
 }
 
 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