From fd2ad9c7d92192b845996683a8f59712be3a2e72 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Sun, 19 May 2024 10:30:36 +0200 Subject: [PATCH] Fix windows build --- build/patches/Disable-Compose-feature.patch | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/build/patches/Disable-Compose-feature.patch b/build/patches/Disable-Compose-feature.patch index ebac5753..0daefaf9 100644 --- a/build/patches/Disable-Compose-feature.patch +++ b/build/patches/Disable-Compose-feature.patch @@ -4,10 +4,25 @@ Subject: Disable Compose feature License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- - components/compose/core/browser/compose_features.cc | 2 ++ - components/compose/features.gni | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) + chrome/browser/extensions/api/settings_private/prefs_util.cc | 2 ++ + components/compose/core/browser/compose_features.cc | 2 ++ + components/compose/features.gni | 2 +- + 3 files changed, 5 insertions(+), 1 deletion(-) +diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc +--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc ++++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc +@@ -483,8 +483,10 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() { + (*s_allowlist) + [::permissions::prefs::kUnusedSitePermissionsRevocationEnabled] = + settings_api::PrefType::kBoolean; ++#if BUILDFLAG(ENABLE_COMPOSE) + (*s_allowlist)[prefs::kEnableProactiveNudge] = + settings_api::PrefType::kBoolean; ++#endif + + // Clear browsing data settings. + (*s_allowlist)[browsing_data::prefs::kDeleteBrowsingHistory] = diff --git a/components/compose/core/browser/compose_features.cc b/components/compose/core/browser/compose_features.cc --- a/components/compose/core/browser/compose_features.cc +++ b/components/compose/core/browser/compose_features.cc