diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc index 5bcb8e554eb6..5f63460fb5ac 100644 --- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2021-12-31 00:57:23 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2022-02-07 13:39:41 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -83,11 +83,11 @@ +@@ -84,7 +84,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,12 +9,7 @@ #include "chrome/common/chrome_paths_internal.h" #include "chrome/grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" --#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - - #if BUILDFLAG(ENABLE_EXTENSIONS) - #include "extensions/common/constants.h" -@@ -134,10 +134,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -139,7 +139,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -22,12 +17,8 @@ +#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); --#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) - auth_dynamic_params->ntlm_v2_enabled = -@@ -365,10 +365,10 @@ SystemNetworkContextManager::SystemNetworkContextManag + #endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) +@@ -370,7 +370,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kBasicAuthOverHttpEnabled, auth_pref_callback); @@ -35,12 +26,8 @@ +#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); --#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) - pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback); -@@ -423,10 +423,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe + #endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) +@@ -428,7 +428,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterStringPref(prefs::kAuthServerAllowlist, std::string()); registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist, std::string()); @@ -48,12 +35,8 @@ +#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, false); --#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) - registry->RegisterBooleanPref( -@@ -559,7 +559,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea + #endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) +@@ -575,7 +575,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. |