summaryrefslogtreecommitdiffstats
path: root/net/net_lib.scons
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-19 22:17:53 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-19 22:17:53 +0000
commit51fff29dc2dae1a8be5ea107d2b13205510c4e46 (patch)
tree56a82f110e5605f9aed8f75b2cf954cc5765ed1a /net/net_lib.scons
parent4750a86ea19e14d99a6b5fc94cd18d08ced463da (diff)
downloadchromium_src-51fff29dc2dae1a8be5ea107d2b13205510c4e46.zip
chromium_src-51fff29dc2dae1a8be5ea107d2b13205510c4e46.tar.gz
chromium_src-51fff29dc2dae1a8be5ea107d2b13205510c4e46.tar.bz2
Split ProxyResolver into two interfaces: A. interface for retrieving the system proxy settings (ProxyConfigService) B. interface for resolving the proxy (ProxyResolver)The motivation behind this change is: 1. Simplify sharing the WinHTTP code that fetches IE settings, with the V8 proxy resolver (avoids having platform-specific code in ProxyResolverV8). 2. Restrict objects to one thread. (ProxyService calls the config getter on IO thread, and the proxy resolving on the PAC thread).(ProxyResolver is now only 1 method, but this will grow shortly).
Review URL: http://codereview.chromium.org/15070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7323 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net_lib.scons')
-rw-r--r--net/net_lib.scons2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/net_lib.scons b/net/net_lib.scons
index 75e33a7..d9566a6 100644
--- a/net/net_lib.scons
+++ b/net/net_lib.scons
@@ -81,7 +81,6 @@ input_files = [
'http/http_util.cc',
'http/http_vary_data.cc',
'http/winhttp_request_throttle.cc',
- 'proxy/proxy_resolver_fixed.cc',
'proxy/proxy_script_fetcher.cc',
'proxy/proxy_service.cc',
'url_request/mime_sniffer_proxy.cc',
@@ -127,6 +126,7 @@ if env.Bit('windows'):
'disk_cache/cache_util_win.cc',
'disk_cache/file_win.cc',
'disk_cache/mapped_file_win.cc',
+ 'proxy/proxy_config_service_win.cc',
'proxy/proxy_resolver_winhttp.cc',
'url_request/url_request_inet_job.cc',
])