diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:33 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:33 +0000 |
commit | 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 (patch) | |
tree | a4f824bd33cb075dd5aa3eb5a0a94af221bbe83a /netwerk/base/nsProtocolProxyService.h | |
parent | Adding debian version 124.0.1-1. (diff) | |
download | firefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.tar.xz firefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.zip |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'netwerk/base/nsProtocolProxyService.h')
-rw-r--r-- | netwerk/base/nsProtocolProxyService.h | 10 |
1 files changed, 7 insertions, 3 deletions
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 |