diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:20:33 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:28:57 +0000 |
| commit | d17ea114e5ef69ad5d5d7413280a13e6428098aa (patch) | |
| tree | 2c01a75df69f30d27b1432467cfe7c1467a498da /chromium/net/proxy_resolution/proxy_config_service_win.h | |
| parent | 8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (diff) | |
| download | qtwebengine-chromium-d17ea114e5ef69ad5d5d7413280a13e6428098aa.tar.gz | |
BASELINE: Update Chromium to 67.0.3396.47
Change-Id: Idcb1341782e417561a2473eeecc82642dafda5b7
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/net/proxy_resolution/proxy_config_service_win.h')
| -rw-r--r-- | chromium/net/proxy_resolution/proxy_config_service_win.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chromium/net/proxy_resolution/proxy_config_service_win.h b/chromium/net/proxy_resolution/proxy_config_service_win.h index 9ee40c5a1a7..cd050a6f778 100644 --- a/chromium/net/proxy_resolution/proxy_config_service_win.h +++ b/chromium/net/proxy_resolution/proxy_config_service_win.h @@ -15,6 +15,7 @@ #include "base/gtest_prod_util.h" #include "net/base/net_export.h" #include "net/proxy_resolution/polling_proxy_config_service.h" +#include "net/proxy_resolution/proxy_config_with_annotation.h" namespace base { namespace win { @@ -49,7 +50,7 @@ namespace net { class NET_EXPORT_PRIVATE ProxyConfigServiceWin : public PollingProxyConfigService { public: - ProxyConfigServiceWin(); + ProxyConfigServiceWin(const NetworkTrafficAnnotationTag& traffic_annotation); ~ProxyConfigServiceWin() override; // Overrides a function from PollingProxyConfigService. @@ -68,7 +69,9 @@ class NET_EXPORT_PRIVATE ProxyConfigServiceWin // This is called whenever one of the registry keys we are watching change. void OnObjectSignaled(base::win::RegKey* key); - static void GetCurrentProxyConfig(ProxyConfig* config); + static void GetCurrentProxyConfig( + const NetworkTrafficAnnotationTag traffic_annotation, + ProxyConfigWithAnnotation* config); // Set |config| using the proxy configuration values of |ie_config|. static void SetFromIEConfig( |