summaryrefslogtreecommitdiff
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.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc
index 05a46ca8cebc..55ea8b7fe5b2 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__features.cc
@@ -1,8 +1,8 @@
---- chrome/common/chrome_features.cc.orig 2019-04-30 22:22:37 UTC
+--- chrome/common/chrome_features.cc.orig 2019-06-04 18:55:18 UTC
+++ chrome/common/chrome_features.cc
-@@ -96,13 +96,13 @@ const base::Feature kAutomaticTabDiscarding{"Automatic
- base::FEATURE_ENABLED_BY_DEFAULT};
- #endif // defined(OS_WIN) || defined(OS_MACOSX)
+@@ -92,13 +92,13 @@ const base::Feature kAutoFetchOnNetErrorPage{"AutoFetc
+ base::FEATURE_DISABLED_BY_DEFAULT};
+ #endif // defined(OS_ANDROID)
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
@@ -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 @@ const base::Feature kThirdPartyModulesBlocking{
+@@ -144,7 +144,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{
-@@ -216,7 +216,7 @@ const base::Feature kUsageTimeLimitPolicy{"UsageTimeLi
+@@ -204,7 +204,7 @@ const base::Feature kUsageTimeLimitPolicy{"UsageTimeLi
+ // Enables or disables windowing related features for desktop PWAs.
const base::Feature kDesktopPWAWindowing {
"DesktopPWAWindowing",
- #if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || \
-- defined(OS_MACOSX)
-+ defined(OS_MACOSX) || defined(OS_BSD)
+-#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || \
++#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
+ defined(OS_MACOSX)
base::FEATURE_ENABLED_BY_DEFAULT
#else
- base::FEATURE_DISABLED_BY_DEFAULT