aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_common_chrome__features.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-chrome_common_chrome__features.cc')
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__features.cc31
1 files changed, 23 insertions, 8 deletions
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc
index 72c78872e51f..5e39098d9c4f 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__features.cc
@@ -1,18 +1,33 @@
---- chrome/common/chrome_features.cc.orig 2020-07-07 21:58:14 UTC
+--- chrome/common/chrome_features.cc.orig 2020-11-13 06:36:38 UTC
+++ chrome/common/chrome_features.cc
-@@ -68,13 +68,13 @@ const base::Feature kAsyncDns {
+@@ -96,13 +96,13 @@ const base::Feature kAsyncDns {
#endif
};
--#if defined(OS_WIN) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
// 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)
-+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)
++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
- #if !defined(OS_ANDROID)
- // Enables logging UKMs for background tab activity by TabActivityWatcher.
+ #if defined(OS_CHROMEOS)
+ // Enable Borealis on Chrome OS.
+@@ -337,12 +337,12 @@ const base::Feature kEnableAmbientAuthenticationInInco
+ "EnableAmbientAuthenticationInIncognito",
+ base::FEATURE_DISABLED_BY_DEFAULT};
+
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD)
+ COMPONENT_EXPORT(CHROME_FEATURES)
+ // Enables ephemeral Guest profiles on desktop.
+ extern const base::Feature kEnableEphemeralGuestProfilesOnDesktop{
+ "EnableEphemeralGuestProfilesOnDesktop", base::FEATURE_DISABLED_BY_DEFAULT};
+-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC)
++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD)
+
+ #if defined(OS_WIN)
+ // Enables users to create a desktop shortcut for incognito mode.