| Index: chrome/browser/extensions/admin_policy.cc
|
| diff --git a/chrome/browser/extensions/admin_policy.cc b/chrome/browser/extensions/admin_policy.cc
|
| index 0f1e95cad41adac25533c2c4ddc62a24530e74fa..6961b008394cb49bbff14d42746919a39837c801 100644
|
| --- a/chrome/browser/extensions/admin_policy.cc
|
| +++ b/chrome/browser/extensions/admin_policy.cc
|
| @@ -17,6 +17,7 @@ bool ManagementPolicyImpl(const extensions::Extension* extension,
|
| bool modifiable_value) {
|
| bool modifiable =
|
| extension->location() != extensions::Manifest::COMPONENT &&
|
| + extension->location() != extensions::Manifest::EXTERNAL_POLICY &&
|
| extension->location() != extensions::Manifest::EXTERNAL_POLICY_DOWNLOAD;
|
| // Some callers equate "no restriction" to true, others to false.
|
| if (modifiable)
|
| @@ -61,7 +62,8 @@ bool UserMayLoad(const base::ListValue* blacklist,
|
| return true;
|
|
|
| // Forced installed extensions cannot be overwritten manually.
|
| - if (extension->location() != Manifest::EXTERNAL_POLICY_DOWNLOAD &&
|
| + if (extension->location() != Manifest::EXTERNAL_POLICY &&
|
| + extension->location() != Manifest::EXTERNAL_POLICY_DOWNLOAD &&
|
| forcelist && forcelist->HasKey(extension->id())) {
|
| return ReturnLoadError(extension, error);
|
| }
|
|
|