aboutsummaryrefslogtreecommitdiff
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.cc26
1 files changed, 13 insertions, 13 deletions
diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc
index 26f2e59870e8..66315fb8d269 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.cc
+++ b/www/chromium/files/patch-chrome_common_pref__names.cc
@@ -1,4 +1,4 @@
---- chrome/common/pref_names.cc.orig 2020-07-07 21:58:14 UTC
+--- chrome/common/pref_names.cc.orig 2020-11-13 06:36:38 UTC
+++ chrome/common/pref_names.cc
@@ -1076,7 +1076,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y
// only using an account that belongs to one of the domains from this pref.
@@ -9,7 +9,7 @@
// Linux specific preference on whether we should match the system theme.
const char kUsesSystemTheme[] = "extensions.theme.use_system";
#endif
-@@ -1213,7 +1213,7 @@ const char kShowUpdatePromotionInfoBar[] =
+@@ -1238,7 +1238,7 @@ const char kShowUpdatePromotionInfoBar[] =
"browser.show_update_promotion_info_bar";
#endif
@@ -18,31 +18,31 @@
// 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";
-@@ -1651,7 +1651,7 @@ const char kDownloadDefaultDirectory[] = "download.def
+@@ -1685,7 +1685,7 @@ const char kDownloadDefaultDirectory[] = "download.def
// upgrade a unsafe location to a safe location.
const char kDownloadDirUpgraded[] = "download.directory_upgrade";
--#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \
+ defined(OS_MAC)
const char kOpenPdfDownloadInSystemReader[] =
"download.open_pdf_in_system_reader";
- #endif
-@@ -1962,12 +1962,12 @@ const char kGloballyScopeHTTPAuthCacheEnabled[] =
+@@ -2027,12 +2027,12 @@ const char kGloballyScopeHTTPAuthCacheEnabled[] =
const char kAmbientAuthenticationInPrivateModesEnabled[] =
"auth.ambient_auth_in_private_modes";
--#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD)
// Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected
- // along with kAuthNegotiateDelegateWhitelist.
+ // along with kAuthNegotiateDelegateAllowlist.
const char kAuthNegotiateDelegateByKdcPolicy[] =
"auth.negotiate_delegate_by_kdc_policy";
--#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
-+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS)
++#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD)
#if defined(OS_POSIX)
// Boolean that specifies whether NTLMv2 is enabled.
-@@ -2874,7 +2874,7 @@ const char kAutoplayWhitelist[] = "media.autoplay_whit
+@@ -2931,7 +2931,7 @@ const char kAutoplayWhitelist[] = "media.autoplay_whit
const char kBlockAutoplayEnabled[] = "media.block_autoplay";
#endif // !defined(OS_ANDROID)