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.cc16
1 files changed, 8 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 cae6621ecb32..87c61435a02d 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__features.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_features.cc.orig 2018-12-03 21:16:43.000000000 +0100
-+++ chrome/common/chrome_features.cc 2018-12-05 16:12:25.391529000 +0100
-@@ -91,13 +91,13 @@
+--- chrome/common/chrome_features.cc.orig 2019-03-11 22:00:54 UTC
++++ chrome/common/chrome_features.cc
+@@ -82,13 +82,13 @@ const base::Feature kAutomaticTabDiscarding{"Automatic
base::FEATURE_ENABLED_BY_DEFAULT};
#endif // defined(OS_WIN) || defined(OS_MACOSX)
@@ -16,7 +16,7 @@
// Enables or disables whether permission prompts are automatically blocked
// after the user has explicitly dismissed them too many times.
-@@ -152,7 +152,7 @@
+@@ -131,7 +131,7 @@ const base::Feature kThirdPartyModulesBlocking{
"ThirdPartyModulesBlocking", base::FEATURE_DISABLED_BY_DEFAULT};
#endif
@@ -25,12 +25,12 @@
// Enables the dual certificate verification trial feature.
// https://crbug.com/649026
const base::Feature kCertDualVerificationTrialFeature{
-@@ -201,7 +201,7 @@
- // Enables or disables windowing related features for desktop PWAs.
+@@ -195,7 +195,7 @@ const base::Feature kUsageTimeLimitPolicy{"UsageTimeLi
const base::Feature kDesktopPWAWindowing {
"DesktopPWAWindowing",
--#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX)
-+#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ #if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || \
+- defined(OS_MACOSX)
++ defined(OS_MACOSX) || defined(OS_BSD)
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT