From 3cd94714f7eaca01026b07e1e02a77afa514ebcf Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 10 Jun 2024 11:03:13 -0400 Subject: [PATCH] alloy: Move warning after logging init (fixes #3713) --- libcef/browser/main_runner.cc | 6 ------ libcef/common/alloy/alloy_main_delegate.cc | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libcef/browser/main_runner.cc b/libcef/browser/main_runner.cc index 1aed49979..3edd6dd91 100644 --- a/libcef/browser/main_runner.cc +++ b/libcef/browser/main_runner.cc @@ -269,12 +269,6 @@ bool CefMainRunner::Initialize(CefSettings* settings, void* windows_sandbox_info, bool* initialized, base::OnceClosure context_initialized) { -#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP) - LOG_IF(WARNING, !settings->chrome_runtime) - << "Alloy bootstrap is deprecated and will be removed in ~M127. See " - "https://github.com/chromiumembedded/cef/issues/3685"; -#endif - DCHECK(!main_delegate_); main_delegate_ = MakeDelegate( #if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP) diff --git a/libcef/common/alloy/alloy_main_delegate.cc b/libcef/common/alloy/alloy_main_delegate.cc index ebff53b4b..db82d56f4 100644 --- a/libcef/common/alloy/alloy_main_delegate.cc +++ b/libcef/common/alloy/alloy_main_delegate.cc @@ -555,6 +555,12 @@ std::optional AlloyMainDelegate::BasicStartupComplete() { logging::InitLogging(log_settings); + if (is_browser) { + LOG(WARNING) + << "Alloy bootstrap is deprecated and will be removed in ~M127. See " + "https://github.com/chromiumembedded/cef/issues/3685"; + } + ContentSettingsPattern::SetNonWildcardDomainNonPortSchemes( kNonWildcardDomainNonPortSchemes, kNonWildcardDomainNonPortSchemesSize);