diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_common_pref__names.h')
| -rw-r--r-- | www/chromium/files/patch-chrome_common_pref__names.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index 18d910d8ffb9..9cee086e02ea 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.h +++ b/www/chromium/files/patch-chrome_common_pref__names.h @@ -1,24 +1,24 @@ ---- chrome/common/pref_names.h.orig 2021-01-18 21:28:52 UTC +--- chrome/common/pref_names.h.orig 2021-03-12 23:57:19 UTC +++ chrome/common/pref_names.h -@@ -357,7 +357,7 @@ extern const char kAllowDeletingBrowserHistory[]; - extern const char kForceGoogleSafeSearch[]; - extern const char kForceYouTubeRestrict[]; +@@ -364,7 +364,7 @@ extern const char kForceYouTubeRestrict[]; extern const char kAllowedDomainsForApps[]; --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -384,7 +384,7 @@ extern const char kDefaultBrowserSettingEnabled[]; - #if defined(OS_MAC) - extern const char kShowUpdatePromotionInfoBar[]; +@@ -393,7 +393,7 @@ extern const char kShowUpdatePromotionInfoBar[]; #endif --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) extern const char kUseCustomChromeFrame[]; #endif #if BUILDFLAG(ENABLE_PLUGINS) -@@ -554,7 +554,7 @@ extern const char kDownloadExtensionsToOpen[]; +@@ -564,7 +564,7 @@ extern const char kDownloadExtensionsToOpen[]; extern const char kDownloadExtensionsToOpenByPolicy[]; extern const char kDownloadAllowedURLsForOpenByPolicy[]; extern const char kDownloadDirUpgraded[]; @@ -27,7 +27,7 @@ defined(OS_MAC) extern const char kOpenPdfDownloadInSystemReader[]; #endif -@@ -783,9 +783,9 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] +@@ -795,9 +795,9 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] extern const char kAmbientAuthenticationInPrivateModesEnabled[]; extern const char kBasicAuthOverHttpEnabled[]; @@ -39,12 +39,12 @@ #if defined(OS_POSIX) extern const char kNtlmV2Enabled[]; -@@ -1014,7 +1014,7 @@ extern const char kAutoplayWhitelist[]; - extern const char kBlockAutoplayEnabled[]; - #endif +@@ -1028,7 +1028,7 @@ extern const char kBlockAutoplayEnabled[]; --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) extern const char kAllowNativeNotifications[]; #endif |