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.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc
index 4591e746fab7..99096dbc73ed 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 2020-03-16 18:40:30 UTC
+--- chrome/common/chrome_features.cc.orig 2020-05-13 18:40:25 UTC
+++ chrome/common/chrome_features.cc
-@@ -86,13 +86,13 @@ const base::Feature kAsyncDns {
+@@ -66,13 +66,13 @@ const base::Feature kAsyncDns {
#endif
};
@@ -14,5 +14,5 @@
-#endif // defined(OS_WIN) || defined(OS_LINUX)
+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
- // Once the user declines a notification permission prompt in a WebContents,
- // automatically dismiss subsequent prompts in the same WebContents, from any
+ #if !defined(OS_ANDROID)
+ // Enables logging UKMs for background tab activity by TabActivityWatcher.