summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_common_pref__names.h
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-chrome_common_pref__names.h')
-rw-r--r--www/chromium/files/patch-chrome_common_pref__names.h28
1 files changed, 14 insertions, 14 deletions
diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h
index a8bfca1a5142..b7cd0378d468 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.h
+++ b/www/chromium/files/patch-chrome_common_pref__names.h
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.h.orig 2020-09-08 19:14:01 UTC
+--- chrome/common/pref_names.h.orig 2020-11-13 06:36:38 UTC
+++ chrome/common/pref_names.h
-@@ -349,7 +349,7 @@ extern const char kHistoryMenuPromoShown[];
+@@ -355,7 +355,7 @@ extern const char kHistoryMenuPromoShown[];
extern const char kForceGoogleSafeSearch[];
extern const char kForceYouTubeRestrict[];
extern const char kAllowedDomainsForApps[];
@@ -9,8 +9,8 @@
extern const char kUsesSystemTheme[];
#endif
extern const char kCurrentThemePackFilename[];
-@@ -380,7 +380,7 @@ extern const char kDefaultBrowserSettingEnabled[];
- #if defined(OS_MACOSX)
+@@ -385,7 +385,7 @@ extern const char kDefaultBrowserSettingEnabled[];
+ #if defined(OS_MAC)
extern const char kShowUpdatePromotionInfoBar[];
#endif
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
@@ -18,28 +18,28 @@
extern const char kUseCustomChromeFrame[];
#endif
#if BUILDFLAG(ENABLE_PLUGINS)
-@@ -556,7 +556,7 @@ extern const char kDownloadExtensionsToOpen[];
+@@ -554,7 +554,7 @@ extern const char kDownloadExtensionsToOpen[];
extern const char kDownloadExtensionsToOpenByPolicy[];
extern const char kDownloadAllowedURLsForOpenByPolicy[];
extern const char kDownloadDirUpgraded[];
--#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)
extern const char kOpenPdfDownloadInSystemReader[];
#endif
- #if defined(OS_ANDROID)
-@@ -776,9 +776,9 @@ extern const char kAllowCrossOriginAuthPrompt[];
+@@ -777,9 +777,9 @@ extern const char kAllowCrossOriginAuthPrompt[];
extern const char kGloballyScopeHTTPAuthCacheEnabled[];
extern const char kAmbientAuthenticationInPrivateModesEnabled[];
--#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)
extern const char kAuthNegotiateDelegateByKdcPolicy[];
--#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)
extern const char kNtlmV2Enabled[];
-@@ -1010,7 +1010,7 @@ extern const char kAutoplayWhitelist[];
+@@ -1006,7 +1006,7 @@ extern const char kAutoplayWhitelist[];
extern const char kBlockAutoplayEnabled[];
#endif