| Index: chrome/browser/extensions/extension_service.cc
|
| diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
|
| index 4cecaddab3e02cc9e9697c9d3f7a01d4ab746468..74a1c6eb93d56b5e166779e7d7edc45768a97853 100644
|
| --- a/chrome/browser/extensions/extension_service.cc
|
| +++ b/chrome/browser/extensions/extension_service.cc
|
| @@ -871,7 +871,6 @@ void ExtensionService::EnableExtension(const std::string& extension_id) {
|
| UMA_HISTOGRAM_COUNTS_100("Extensions.EnableDeniedByPolicy", 1);
|
| return;
|
| }
|
| -
|
| extension_prefs_->SetExtensionEnabled(extension_id);
|
|
|
| // This can happen if sync enables an extension that is not installed yet.
|
| @@ -1212,6 +1211,15 @@ void ExtensionService::CheckManagementPolicy() {
|
|
|
| extensions::ExtensionManagement* management =
|
| extensions::ExtensionManagementFactory::GetForBrowserContext(profile());
|
| + for (const auto& extension : registry_->enabled_extensions()) {
|
| + extensions::PermissionsUpdater(profile()).SetPolicyHostRestrictions(
|
| + extension.get(), management->GetRuntimeBlockedHosts(extension.get()),
|
| + management->GetRuntimeAllowedHosts(extension.get()),
|
| + management->UsesDefaultRuntimeHostRestrictions(extension.get()));
|
| + }
|
| + extensions::PermissionsUpdater(profile()).SetDefaultPolicyHostRestrictions(
|
| + management->GetDefaultRuntimeBlockedHosts(),
|
| + management->GetDefaultRuntimeAllowedHosts());
|
|
|
| // Loop through the disabled extension list, find extensions to re-enable
|
| // automatically. These extensions are exclusive from the |to_disable| and
|
| @@ -1460,7 +1468,6 @@ void ExtensionService::AddExtension(const Extension* extension) {
|
| disable_flag_exempted_extensions_.count(extension->id()) == 0) {
|
| return;
|
| }
|
| -
|
| bool is_extension_upgrade = false;
|
| bool is_extension_loaded = false;
|
| const Extension* old = GetInstalledExtension(extension->id());
|
|
|