From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:33 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- netwerk/base/nsProtocolProxyService.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'netwerk/base/nsProtocolProxyService.h') diff --git a/netwerk/base/nsProtocolProxyService.h b/netwerk/base/nsProtocolProxyService.h index 394450ca6e..2c102a808e 100644 --- a/netwerk/base/nsProtocolProxyService.h +++ b/netwerk/base/nsProtocolProxyService.h @@ -320,9 +320,13 @@ class nsProtocolProxyService final : public nsIProtocolProxyService2, nsresult ResetPACThread(); nsresult ReloadNetworkPAC(); - nsresult AsyncConfigureFromPAC(bool aForceReload, bool aResetPACThread); - nsresult OnAsyncGetPACURI(bool aForceReload, bool aResetPACThread, - nsresult aResult, const nsACString& aUri); + nsresult AsyncConfigureWPADOrFromPAC(bool aForceReload, bool aResetPACThread, + bool aSystemWPADAllowed); + nsresult OnAsyncGetPACURIOrSystemWPADSetting(bool aForceReload, + bool aResetPACThread, + nsresult aResult, + const nsACString& aUri, + bool aSystemWPADSetting); public: // The Sun Forte compiler and others implement older versions of the -- cgit v1.2.3