| diff --git chrome/browser/content_settings/host_content_settings_map_factory.cc chrome/browser/content_settings/host_content_settings_map_factory.cc |
| index 937b56a2e261..9e3877b06c59 100644 |
| --- chrome/browser/content_settings/host_content_settings_map_factory.cc |
| +++ chrome/browser/content_settings/host_content_settings_map_factory.cc |
| @@ -8,6 +8,7 @@ |
| |
| #include "base/feature_list.h" |
| #include "build/buildflag.h" |
| +#include "cef/libcef/features/features.h" |
| #include "chrome/browser/profiles/off_the_record_profile_impl.h" |
| #include "chrome/browser/profiles/profile.h" |
| #include "chrome/browser/search_engines/template_url_service_factory.h" |
| @@ -19,6 +20,10 @@ |
| #include "content/public/browser/browser_thread.h" |
| #include "extensions/buildflags/buildflags.h" |
| |
| +#if BUILDFLAG(ENABLE_CEF) |
| +#include "cef/libcef/common/extensions/extensions_util.h" |
| +#endif |
| + |
| #if BUILDFLAG(ENABLE_EXTENSIONS) |
| #include "chrome/browser/extensions/extension_service.h" |
| #include "extensions/browser/extension_system.h" |
| @@ -47,8 +52,14 @@ HostContentSettingsMapFactory::HostContentSettingsMapFactory() |
| DependsOn(SupervisedUserSettingsServiceFactory::GetInstance()); |
| #endif |
| #if BUILDFLAG(ENABLE_EXTENSIONS) |
| +#if BUILDFLAG(ENABLE_CEF) |
| + if (extensions::ExtensionsEnabled()) { |
| +#endif |
| DependsOn( |
| extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); |
| +#if BUILDFLAG(ENABLE_CEF) |
| + } |
| +#endif |
| #endif |
| } |
| |
| @@ -89,10 +100,16 @@ scoped_refptr<RefcountedKeyedService> |
| permissions::features::kPermissionDelegation))); |
| |
| #if BUILDFLAG(ENABLE_EXTENSIONS) |
| +#if BUILDFLAG(ENABLE_CEF) |
| + if (extensions::ExtensionsEnabled()) { |
| +#endif |
| // These must be registered before before the HostSettings are passed over to |
| // the IOThread. Simplest to do this on construction. |
| extensions::ExtensionService::RegisterContentSettings(settings_map.get(), |
| profile); |
| +#if BUILDFLAG(ENABLE_CEF) |
| + } |
| +#endif |
| #endif // BUILDFLAG(ENABLE_EXTENSIONS) |
| #if BUILDFLAG(ENABLE_SUPERVISED_USERS) |
| SupervisedUserSettingsService* supervised_service = |