Differential D23984 Diff 69253 www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
Changeset View
Changeset View
Standalone View
Standalone View
www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
| --- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2019-12-16 21:51:23 UTC | --- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2020-03-03 18:53:51 UTC | ||||
| +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc | +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc | ||||
| @@ -113,7 +113,7 @@ | @@ -117,7 +117,7 @@ | ||||
| #endif | #endif | ||||
| #if defined(OS_WIN) || defined(OS_MACOSX) || \ | #if defined(OS_WIN) || defined(OS_MACOSX) || \ | ||||
| - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) | - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) | ||||
| + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) | + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) | ||||
| #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" | #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" | ||||
| #endif | #endif | ||||
| @@ -352,11 +352,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = | @@ -357,11 +357,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = | ||||
| prefs::kSafeBrowsingSendFilesForMalwareCheck, | { key::kWebComponentsV0Enabled, | ||||
| base::Value::Type::INTEGER | prefs::kWebComponentsV0Enabled, | ||||
| }, | base::Value::Type::BOOLEAN }, | ||||
| -#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) | ||||
| { key::kAuthNegotiateDelegateByKdcPolicy, | { key::kAuthNegotiateDelegateByKdcPolicy, | ||||
| prefs::kAuthNegotiateDelegateByKdcPolicy, | prefs::kAuthNegotiateDelegateByKdcPolicy, | ||||
| base::Value::Type::BOOLEAN }, | base::Value::Type::BOOLEAN }, | ||||
| -#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) | ||||
| { key::kNtlmV2Enabled, | { key::kNtlmV2Enabled, | ||||
| prefs::kNtlmV2Enabled, | prefs::kNtlmV2Enabled, | ||||
| @@ -1141,7 +1141,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = | @@ -1147,7 +1147,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = | ||||
| prefs::kExternalProtocolDialogShowAlwaysOpenCheckbox, | |||||
| base::Value::Type::BOOLEAN }, | base::Value::Type::BOOLEAN }, | ||||
| #if defined(OS_WIN) || defined(OS_MACOSX) || \ | #if defined(OS_WIN) || defined(OS_MACOSX) || \ | ||||
| - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) | - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) | ||||
| + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) | + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) | ||||
| { key::kAlternativeBrowserPath, | { key::kAlternativeBrowserPath, | ||||
| browser_switcher::prefs::kAlternativeBrowserPath, | browser_switcher::prefs::kAlternativeBrowserPath, | ||||
| base::Value::Type::STRING }, | base::Value::Type::STRING }, | ||||
| @@ -1205,7 +1205,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = | @@ -1208,7 +1208,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = | ||||
| browser_switcher::prefs::kChromeParameters, | browser_switcher::prefs::kChromeParameters, | ||||
| base::Value::Type::LIST }, | base::Value::Type::LIST }, | ||||
| #endif | #endif | ||||
| -#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) | -#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) | ||||
| +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) | +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) | ||||
| { key::kBrowserGuestModeEnforced, | { key::kBrowserGuestModeEnforced, | ||||
| prefs::kBrowserGuestModeEnforced, | prefs::kBrowserGuestModeEnforced, | ||||
| base::Value::Type::BOOLEAN }, | base::Value::Type::BOOLEAN }, | ||||