Page MenuHomeFreeBSD
Differential D23984 Diff 69308 head/www/chromium/files/patch-chrome_common_pref__names.h

Changeset View

Standalone View

View Options

head/www/chromium/files/patch-chrome_common_pref__names.h

--- chrome/common/pref_names.h.orig 2019-12-16 21:51:24 UTC --- chrome/common/pref_names.h.orig 2020-03-03 18:53:53 UTC
+++ chrome/common/pref_names.h +++ chrome/common/pref_names.h
@@ -330,7 +330,7 @@ extern const char kHistoryMenuPromoShown[]; @@ -331,7 +331,7 @@ extern const char kHistoryMenuPromoShown[];
extern const char kForceGoogleSafeSearch[]; extern const char kForceGoogleSafeSearch[];
extern const char kForceYouTubeRestrict[]; extern const char kForceYouTubeRestrict[];
extern const char kAllowedDomainsForApps[]; extern const char kAllowedDomainsForApps[];
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
extern const char kUsesSystemTheme[]; extern const char kUsesSystemTheme[];
#endif #endif
extern const char kCurrentThemePackFilename[]; extern const char kCurrentThemePackFilename[];
@@ -361,7 +361,7 @@ extern const char kDefaultBrowserSettingEnabled[]; @@ -362,7 +362,7 @@ extern const char kDefaultBrowserSettingEnabled[];
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
extern const char kShowUpdatePromotionInfoBar[]; extern const char kShowUpdatePromotionInfoBar[];
#endif #endif
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
extern const char kUseCustomChromeFrame[]; extern const char kUseCustomChromeFrame[];
#endif #endif
#if BUILDFLAG(ENABLE_PLUGINS) #if BUILDFLAG(ENABLE_PLUGINS)
@@ -523,7 +523,7 @@ extern const char kAppWindowPlacement[]; @@ -527,7 +527,7 @@ extern const char kAppWindowPlacement[];
extern const char kDownloadDefaultDirectory[]; extern const char kDownloadDefaultDirectory[];
extern const char kDownloadExtensionsToOpen[]; extern const char kDownloadExtensionsToOpen[];
extern const char kDownloadDirUpgraded[]; extern const char kDownloadDirUpgraded[];
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -#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_MACOSX) || defined(OS_BSD)
extern const char kOpenPdfDownloadInSystemReader[]; extern const char kOpenPdfDownloadInSystemReader[];
#endif #endif
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
@@ -729,9 +729,9 @@ extern const char kGSSAPILibraryName[]; @@ -738,9 +738,9 @@ extern const char kAllowCrossOriginAuthPrompt[];
extern const char kAuthAndroidNegotiateAccountType[]; extern const char kGloballyScopeHTTPAuthCacheEnabled[];
extern const char kAllowCrossOriginAuthPrompt[]; extern const char kAmbientAuthenticationInPrivateModesEnabled[];
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) -#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_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
extern const char kAuthNegotiateDelegateByKdcPolicy[]; extern const char kAuthNegotiateDelegateByKdcPolicy[];
-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) -#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_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD)
#if defined(OS_POSIX) #if defined(OS_POSIX)
extern const char kNtlmV2Enabled[]; extern const char kNtlmV2Enabled[];