diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 180df3ebf9b2fa..b4f70f787d1ac0 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -11593,7 +11593,11 @@ const FeatureEntry kFeatureEntries[] = { {"double-click-close-tab", "Double Click to Close Tab", "Enables double clicking a tab to close it.", - kOsDesktop, SINGLE_VALUE_TYPE("double-click-close-tab")} + kOsDesktop, SINGLE_VALUE_TYPE("double-click-close-tab")}, + {"disable-ech", "Disable Encrypted ClientHello", + "Disables TLS Encrypted ClientHello support in special cases where it may prevent" + " the usage of some websites.", kOsAll, + SINGLE_VALUE_TYPE("disable-ech")} // TODO: move all Supermium-specific flags to new source file. // NOTE: Adding a new flag requires adding a corresponding entry to enum // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag diff --git a/chrome/browser/ssl/ssl_config_service_manager.cc b/chrome/browser/ssl/ssl_config_service_manager.cc index ef36e55b12f18f..6911786a980645 100644 --- a/chrome/browser/ssl/ssl_config_service_manager.cc +++ b/chrome/browser/ssl/ssl_config_service_manager.cc @@ -10,6 +10,7 @@ #include #include +#include "base/command_line.h" #include "base/feature_list.h" #include "base/functional/bind.h" #include "base/location.h" @@ -224,6 +225,11 @@ network::mojom::SSLConfigPtr SSLConfigServiceManager::GetSSLConfigFromPrefs() config->ech_enabled = ech_enabled_.GetValue(); + if (base::CommandLine::ForCurrentProcess()->HasSwitch( + "disable-ech")) { + config->ech_enabled = false; + } + if (post_quantum_enabled_.IsManaged()) { config->post_quantum_override = post_quantum_enabled_.GetValue() ? network::mojom::OptionalBool::kTrue diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc index f97d9c3988c50d..4f3a8dcdb7e7d8 100644 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc @@ -905,8 +905,8 @@ std::optional LocalFrameClientImpl::UserAgentMetadata() { probe::ApplyUserAgentMetadataOverride(probe::ToCoreProbeSink(document), &user_agent_metadata); - if(user_agent_metadata->platform.empty()) - return std::nullopt; + // if(user_agent_metadata->platform.empty()) + // return std::nullopt; return user_agent_metadata; }