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 | 32 |
1 files changed, 16 insertions, 16 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 afed6828fa4c..6995743b2d87 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,20 +1,20 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2021-01-18 21:28:50 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -77,11 +77,11 @@ - #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" - #endif // defined(OS_CHROMEOS) +@@ -81,11 +81,11 @@ --#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) #include "chrome/common/chrome_paths_internal.h" #include "chrome/grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" --#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#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" -@@ -142,10 +142,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -146,10 +146,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -27,7 +27,7 @@ #if defined(OS_POSIX) auth_dynamic_params->ntlm_v2_enabled = -@@ -360,10 +360,10 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -364,10 +364,10 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kBasicAuthOverHttpEnabled, auth_pref_callback); @@ -40,7 +40,7 @@ #if defined(OS_POSIX) pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback); -@@ -411,10 +411,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -416,10 +416,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterStringPref(prefs::kAuthServerAllowlist, std::string()); registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist, std::string()); @@ -53,12 +53,12 @@ #if defined(OS_POSIX) registry->RegisterBooleanPref( -@@ -506,7 +506,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea - // NetworkContext is created, but before anything has the chance to use it. - stub_resolver_config_reader_.UpdateNetworkService(true /* record_metrics */); +@@ -513,7 +513,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || 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) const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); |