diff --git chrome/browser/content_settings/host_content_settings_map_factory.cc chrome/browser/content_settings/host_content_settings_map_factory.cc index c8a0156b69cc3..6a6fac072143d 100644 --- chrome/browser/content_settings/host_content_settings_map_factory.cc +++ chrome/browser/content_settings/host_content_settings_map_factory.cc @@ -9,6 +9,7 @@ #include "base/feature_list.h" #include "build/build_config.h" #include "build/buildflag.h" +#include "cef/libcef/features/runtime.h" #include "chrome/browser/content_settings/one_time_geolocation_permission_provider.h" #include "chrome/browser/permissions/last_tab_standing_tracker_factory.h" #include "chrome/browser/profiles/off_the_record_profile_impl.h" @@ -22,6 +23,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 "base/trace_event/trace_event.h" #include "extensions/browser/api/content_settings/content_settings_custom_extension_provider.h" @@ -61,7 +66,13 @@ HostContentSettingsMapFactory::HostContentSettingsMapFactory() DependsOn(TemplateURLServiceFactory::GetInstance()); #endif #if BUILDFLAG(ENABLE_EXTENSIONS) +#if BUILDFLAG(ENABLE_CEF) + if (!cef::IsAlloyRuntimeEnabled() || extensions::ExtensionsEnabled()) { +#endif DependsOn(extensions::ContentSettingsService::GetFactoryInstance()); +#if BUILDFLAG(ENABLE_CEF) + } +#endif #endif // Used by way of ShouldRestoreOldSessionCookies(). #if BUILDFLAG(ENABLE_SESSION_SERVICE) @@ -135,6 +146,9 @@ scoped_refptr } #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. settings_map->RegisterProvider( @@ -147,6 +161,9 @@ scoped_refptr // the case where profile->IsOffTheRecord() is true? And what is the // interaction with profile->IsGuestSession()? false)); +#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 c65b17d8ee9e2..1c6e91858ba9e 100644 --- components/content_settings/renderer/content_settings_agent_impl.cc +++ components/content_settings/renderer/content_settings_agent_impl.cc @@ -144,7 +144,7 @@ ContentSetting GetContentSettingFromRules( return rule.GetContentSetting(); } } - NOTREACHED(); + // NOTREACHED(); return CONTENT_SETTING_DEFAULT; } } // namespace