summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_common_chrome__features.cc
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2022-02-20 12:35:15 +0100
committerRene Ladan <rene@FreeBSD.org>2022-02-20 12:42:02 +0100
commita23dfd214ae04e8b4d116ca6411570b684eb5ed6 (patch)
treea42703b6563673398eee97ae6ad4d01eafd77738 /www/chromium/files/patch-chrome_common_chrome__features.cc
parentgraphics/libglvnd: reduce dependency on gcc for everyone on powerpc64* by usi... (diff)
www/chromium: update to 98.0.4758.102
- The port now uses the combined patch set for OpenBSD and FreeBSD maintained by Robert Nagy. - Fix build on i386 again. Obtained from: Robert Nagy <robert@openbsd.org> Security: https://vuxml.freebsd.org/freebsd/e12432af-8e73-11ec-8bc4-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/e852f43c-846e-11ec-b043-3065ec8fd3ec.html
Diffstat (limited to 'www/chromium/files/patch-chrome_common_chrome__features.cc')
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__features.cc72
1 files changed, 29 insertions, 43 deletions
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc
index 631d7dce7d05..e364888836f0 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__features.cc
@@ -1,15 +1,15 @@
---- chrome/common/chrome_features.cc.orig 2022-01-20 10:35:51 UTC
+--- chrome/common/chrome_features.cc.orig 2022-02-07 13:39:41 UTC
+++ chrome/common/chrome_features.cc
-@@ -101,7 +101,7 @@ const base::Feature kAsyncDns {
- #endif
+@@ -110,7 +110,7 @@ const base::Feature kAsyncDns {
};
--#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
-+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \
- defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
+ #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
+- defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
++ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD)
// Enables or disables the Autofill survey triggered by opening a prompt to
// save address info.
-@@ -117,13 +117,13 @@ const base::Feature kAutofillPasswordSurvey{"AutofillP
+ const base::Feature kAutofillAddressSurvey{"AutofillAddressSurvey",
+@@ -125,7 +125,7 @@ const base::Feature kAutofillPasswordSurvey{"AutofillP
base::FEATURE_DISABLED_BY_DEFAULT};
#endif
@@ -18,14 +18,7 @@
// Enables the Restart background mode optimization. When all Chrome UI is
// closed and it goes in the background, allows to restart the browser to
// discard memory.
- const base::Feature kBackgroundModeAllowRestart{
- "BackgroundModeAllowRestart", base::FEATURE_DISABLED_BY_DEFAULT};
--#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
-
- #if BUILDFLAG(IS_CHROMEOS_ASH)
- // Enable Borealis on Chrome OS.
-@@ -134,13 +134,13 @@ const base::Feature kBorealis{"Borealis", base::FEATUR
+@@ -142,7 +142,7 @@ const base::Feature kBorealis{"Borealis", base::FEATUR
const base::Feature kChangePictureVideoMode{"ChangePictureVideoMode",
base::FEATURE_ENABLED_BY_DEFAULT};
@@ -34,32 +27,16 @@
// Controls whether Chrome Apps are supported. See https://crbug.com/1221251.
// If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome
// Apps will not launch and will be marked in the UI as deprecated.
- const base::Feature kChromeAppsDeprecation{"ChromeAppsDeprecation",
- base::FEATURE_DISABLED_BY_DEFAULT};
--#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
-+#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)
-
- const base::Feature kClientStorageAccessContextAuditing{
- "ClientStorageAccessContextAuditing", base::FEATURE_DISABLED_BY_DEFAULT};
-@@ -245,7 +245,7 @@ const base::Feature kDefaultPinnedAppsUpdate2021Q2{
- "DefaultPinnedAppsUpdate2021Q2", base::FEATURE_ENABLED_BY_DEFAULT};
+@@ -255,7 +255,7 @@ const base::Feature kPreinstalledWebAppInstallation{
#endif
--#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)
+ #if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_LINUX) || \
+- defined(OS_FUCHSIA)
++ defined(OS_FUCHSIA) || defined(OS_BSD)
// Enables Desktop PWAs shortcuts menu to be visible and executable in ChromeOS,
// MacOS and Linux.
const base::Feature kDesktopPWAsAppIconShortcutsMenuUI{
-@@ -277,7 +277,7 @@ const base::Feature kDesktopPWAsElidedExtensionsMenu{
- // Handling API.
- const base::Feature kDesktopPWAsFileHandlingSettingsGated{
- "DesktopPWAsFileHandlingSettingsGated",
--#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC)
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD)
- base::FEATURE_ENABLED_BY_DEFAULT
- #else
- base::FEATURE_DISABLED_BY_DEFAULT
-@@ -304,7 +304,7 @@ const base::Feature kDesktopPWAsNotificationIconAndTit
+@@ -303,7 +303,7 @@ const base::Feature kDesktopPWAsNotificationIconAndTit
// Enables or disables Desktop PWAs to be auto-started on OS login.
const base::Feature kDesktopPWAsRunOnOsLogin {
"DesktopPWAsRunOnOsLogin",
@@ -68,7 +45,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -334,7 +334,7 @@ const base::Feature kDesktopPWAsWebBundles{"DesktopPWA
+@@ -337,7 +337,7 @@ const base::FeatureParam<int> kDisableHttpDiskCacheMem
const base::Feature kDnsOverHttps {
"DnsOverHttps",
#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
@@ -77,7 +54,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -356,7 +356,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa
+@@ -359,7 +359,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa
const base::FeatureParam<bool> kDnsOverHttpsShowUiParam {
&kDnsOverHttps, "ShowUi",
#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MAC) || \
@@ -86,12 +63,21 @@
true
#else
false
-@@ -628,7 +628,7 @@ const base::Feature kIncognitoBrandConsistencyForAndro
- const base::Feature kIncognitoNtpRevamp{"IncognitoNtpRevamp",
+@@ -633,7 +633,7 @@ const base::Feature kIncognitoNtpRevamp{"IncognitoNtpR
base::FEATURE_DISABLED_BY_DEFAULT};
--#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \
-+#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
- defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
+ #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \
+- defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
++ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD)
// When enabled, removes any theme or background customization done by the user
// on the Incognito UI.
+ const base::Feature kIncognitoBrandConsistencyForDesktop{
+@@ -675,7 +675,7 @@ const base::Feature kKernelnextVMs{"KernelnextVMs",
+ base::FEATURE_DISABLED_BY_DEFAULT};
+ #endif
+
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ COMPONENT_EXPORT(CHROME_FEATURES)
+ const base::Feature kLinuxLowMemoryMonitor{"LinuxLowMemoryMonitor",
+ base::FEATURE_DISABLED_BY_DEFAULT};