summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_common_pref__names.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-chrome_common_pref__names.cc')
-rw-r--r--www/chromium/files/patch-chrome_common_pref__names.cc19
1 files changed, 14 insertions, 5 deletions
diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc
index edf68e0cec56..6dad9fb69c8c 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.cc
+++ b/www/chromium/files/patch-chrome_common_pref__names.cc
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.cc.orig 2020-03-16 18:40:30 UTC
+--- chrome/common/pref_names.cc.orig 2020-05-13 18:40:25 UTC
+++ chrome/common/pref_names.cc
-@@ -1059,7 +1059,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y
+@@ -1108,7 +1108,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y
// only using an account that belongs to one of the domains from this pref.
const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps";
@@ -9,7 +9,7 @@
// Linux specific preference on whether we should match the system theme.
const char kUsesSystemTheme[] = "extensions.theme.use_system";
#endif
-@@ -1193,7 +1193,7 @@ const char kShowUpdatePromotionInfoBar[] =
+@@ -1242,7 +1242,7 @@ const char kShowUpdatePromotionInfoBar[] =
"browser.show_update_promotion_info_bar";
#endif
@@ -18,7 +18,7 @@
// Boolean that is false if we should show window manager decorations. If
// true, we draw a custom chrome frame (thicker title bar and blue border).
const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame";
-@@ -1621,7 +1621,7 @@ const char kDownloadDefaultDirectory[] = "download.def
+@@ -1677,7 +1677,7 @@ const char kDownloadDefaultDirectory[] = "download.def
// upgrade a unsafe location to a safe location.
const char kDownloadDirUpgraded[] = "download.directory_upgrade";
@@ -27,7 +27,7 @@
const char kOpenPdfDownloadInSystemReader[] =
"download.open_pdf_in_system_reader";
#endif
-@@ -1917,12 +1917,12 @@ const char kGloballyScopeHTTPAuthCacheEnabled[] =
+@@ -1973,12 +1973,12 @@ const char kGloballyScopeHTTPAuthCacheEnabled[] =
const char kAmbientAuthenticationInPrivateModesEnabled[] =
"auth.ambient_auth_in_private_modes";
@@ -42,3 +42,12 @@
#if defined(OS_POSIX)
// Boolean that specifies whether NTLMv2 is enabled.
+@@ -2882,7 +2882,7 @@ const char kAutoplayWhitelist[] = "media.autoplay_whit
+ const char kBlockAutoplayEnabled[] = "media.block_autoplay";
+ #endif // !defined(OS_ANDROID)
+
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // Boolean that indicates if native notifications are allowed to be used in
+ // place of Chrome notifications.
+ const char kAllowNativeNotifications[] = "native_notifications.allowed";