diff options
| author | Sergey Ulanov <sergeyu@chromium.org> | 2014-09-05 18:42:54 -0700 |
|---|---|---|
| committer | Sergey Ulanov <sergeyu@chromium.org> | 2014-09-06 01:44:41 +0000 |
| commit | 2eea434809cdc785f80a1281bea5e634a2cb474c (patch) | |
| tree | 84cc7934e6099a1044dd2662a9e7dcc2c910eb13 /net/proxy | |
| parent | 422789b69ca80bd858bac30d89e26a5fee47fe33 (diff) | |
| download | chromium_src-2eea434809cdc785f80a1281bea5e634a2cb474c.zip chromium_src-2eea434809cdc785f80a1281bea5e634a2cb474c.tar.gz chromium_src-2eea434809cdc785f80a1281bea5e634a2cb474c.tar.bz2 | |
Use ProxyConfigServiceLinux in the chromoting host to configure proxy.
Previously chromoting host wasn't using proxies on linux because
ProxyConfigServiceLinux doesn't work in NPAPI plugins. Now it's not
a problem because we no longer support NPAPI.
BUG=410521,125104
R=jamiewalch@chromium.org, mmenke@chromium.org
Review URL: https://codereview.chromium.org/542473002
Cr-Commit-Position: refs/heads/master@{#293602}
Diffstat (limited to 'net/proxy')
| -rw-r--r-- | net/proxy/proxy_config_service_mac.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/proxy/proxy_config_service_mac.h b/net/proxy/proxy_config_service_mac.h index fe5ce30..6c11c6f 100644 --- a/net/proxy/proxy_config_service_mac.h +++ b/net/proxy/proxy_config_service_mac.h @@ -20,10 +20,7 @@ class SingleThreadTaskRunner; namespace net { -// TODO(sergeyu): This class needs to be exported because remoting code -// creates it directly. Fix that and remove NET_EXPORT here. -// crbug.com/125104 -class NET_EXPORT ProxyConfigServiceMac : public ProxyConfigService { +class ProxyConfigServiceMac : public ProxyConfigService { public: // Constructs a ProxyConfigService that watches the Mac OS system settings. // This instance is expected to be operated and deleted on the same thread |