Changeset View
Changeset View
Standalone View
Standalone View
head/www/chromium/files/patch-chrome_common_pref__names.cc
--- chrome/common/pref_names.cc.orig 2019-12-16 21:51:24 UTC | --- chrome/common/pref_names.cc.orig 2020-03-03 18:53:53 UTC | ||||
+++ chrome/common/pref_names.cc | +++ chrome/common/pref_names.cc | ||||
@@ -1044,7 +1044,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y | @@ -1049,7 +1049,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y | ||||
// only using an account that belongs to one of the domains from this pref. | // only using an account that belongs to one of the domains from this pref. | ||||
const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps"; | const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps"; | ||||
-#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) | ||||
// Linux specific preference on whether we should match the system theme. | // Linux specific preference on whether we should match the system theme. | ||||
const char kUsesSystemTheme[] = "extensions.theme.use_system"; | const char kUsesSystemTheme[] = "extensions.theme.use_system"; | ||||
#endif | #endif | ||||
@@ -1171,7 +1171,7 @@ const char kShowUpdatePromotionInfoBar[] = | @@ -1176,7 +1176,7 @@ const char kShowUpdatePromotionInfoBar[] = | ||||
"browser.show_update_promotion_info_bar"; | "browser.show_update_promotion_info_bar"; | ||||
#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) | ||||
// Boolean that is false if we should show window manager decorations. If | // 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). | // true, we draw a custom chrome frame (thicker title bar and blue border). | ||||
const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; | const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; | ||||
@@ -1572,7 +1572,7 @@ const char kDownloadDefaultDirectory[] = "download.def | @@ -1593,7 +1593,7 @@ const char kDownloadDefaultDirectory[] = "download.def | ||||
// upgrade a unsafe location to a safe location. | // upgrade a unsafe location to a safe location. | ||||
const char kDownloadDirUpgraded[] = "download.directory_upgrade"; | 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) | ||||
+#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) | ||||
const char kOpenPdfDownloadInSystemReader[] = | const char kOpenPdfDownloadInSystemReader[] = | ||||
"download.open_pdf_in_system_reader"; | "download.open_pdf_in_system_reader"; | ||||
#endif | #endif | ||||
@@ -1840,12 +1840,12 @@ const char kAuthAndroidNegotiateAccountType[] = | @@ -1889,12 +1889,12 @@ const char kGloballyScopeHTTPAuthCacheEnabled[] = | ||||
// domain sub-content requests. | const char kAmbientAuthenticationInPrivateModesEnabled[] = | ||||
const char kAllowCrossOriginAuthPrompt[] = "auth.allow_cross_origin_prompt"; | "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) | ||||
+#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) | ||||
// Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected | // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected | ||||
// along with kAuthNegotiateDelegateWhitelist. | // along with kAuthNegotiateDelegateWhitelist. | ||||
const char kAuthNegotiateDelegateByKdcPolicy[] = | const char kAuthNegotiateDelegateByKdcPolicy[] = | ||||
"auth.negotiate_delegate_by_kdc_policy"; | "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) | ||||
+#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) | ||||
// Boolean that specifies whether NTLMv2 is enabled. | // Boolean that specifies whether NTLMv2 is enabled. |