diff --git chrome/browser/content_settings/host_content_settings_map_factory.cc chrome/browser/content_settings/host_content_settings_map_factory.cc index f3b51e20cb9c..b479022f1d3b 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/runtime.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" @@ -20,6 +21,10 @@ #include "extensions/buildflags/buildflags.h" #include "ui/webui/webui_allowlist_provider.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" @@ -48,8 +53,14 @@ HostContentSettingsMapFactory::HostContentSettingsMapFactory() DependsOn(SupervisedUserSettingsServiceFactory::GetInstance()); #endif #if BUILDFLAG(ENABLE_EXTENSIONS) +#if BUILDFLAG(ENABLE_CEF) + if (!cef::IsAlloyRuntimeEnabled() || extensions::ExtensionsEnabled()) { +#endif DependsOn( extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); +#if BUILDFLAG(ENABLE_CEF) + } +#endif #endif } @@ -97,10 +108,16 @@ scoped_refptr std::move(allowlist_provider)); #if BUILDFLAG(ENABLE_EXTENSIONS) +#if BUILDFLAG(ENABLE_CEF) + if (!cef::IsAlloyRuntimeEnabled() || 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 = diff --git components/content_settings/renderer/content_settings_agent_impl.cc components/content_settings/renderer/content_settings_agent_impl.cc index 20ae512af806..e03946e7ce80 100644 --- components/content_settings/renderer/content_settings_agent_impl.cc +++ components/content_settings/renderer/content_settings_agent_impl.cc @@ -176,7 +176,7 @@ ContentSetting GetContentSettingFromRulesImpl( return rule.GetContentSetting(); } } - NOTREACHED(); + // NOTREACHED(); return CONTENT_SETTING_DEFAULT; }