summaryrefslogtreecommitdiff
path: root/www/iridium/files/patch-chrome_common_chrome__features.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/iridium/files/patch-chrome_common_chrome__features.cc')
-rw-r--r--www/iridium/files/patch-chrome_common_chrome__features.cc30
1 files changed, 6 insertions, 24 deletions
diff --git a/www/iridium/files/patch-chrome_common_chrome__features.cc b/www/iridium/files/patch-chrome_common_chrome__features.cc
index 87c61435a02d..4591e746fab7 100644
--- a/www/iridium/files/patch-chrome_common_chrome__features.cc
+++ b/www/iridium/files/patch-chrome_common_chrome__features.cc
@@ -1,8 +1,8 @@
---- chrome/common/chrome_features.cc.orig 2019-03-11 22:00:54 UTC
+--- chrome/common/chrome_features.cc.orig 2020-03-16 18:40:30 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)
+@@ -86,13 +86,13 @@ const base::Feature kAsyncDns {
+ #endif
+ };
-#if defined(OS_WIN) || defined(OS_LINUX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
@@ -14,23 +14,5 @@
-#endif // defined(OS_WIN) || defined(OS_LINUX)
+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
- // Enables or disables whether permission prompts are automatically blocked
- // after the user has explicitly dismissed them too many times.
-@@ -131,7 +131,7 @@ const base::Feature kThirdPartyModulesBlocking{
- "ThirdPartyModulesBlocking", base::FEATURE_DISABLED_BY_DEFAULT};
- #endif
-
--#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD)
- // Enables the dual certificate verification trial feature.
- // https://crbug.com/649026
- const base::Feature kCertDualVerificationTrialFeature{
-@@ -195,7 +195,7 @@ const base::Feature kUsageTimeLimitPolicy{"UsageTimeLi
- const base::Feature kDesktopPWAWindowing {
- "DesktopPWAWindowing",
- #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
+ // Once the user declines a notification permission prompt in a WebContents,
+ // automatically dismiss subsequent prompts in the same WebContents, from any