summaryrefslogtreecommitdiffstats
path: root/net/net_lib.scons
diff options
context:
space:
mode:
authoravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-30 18:47:16 +0000
committeravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-30 18:47:16 +0000
commit332ff119039b7dd3ba3d1994dde0b077f015bc03 (patch)
tree5d6ac0ad34e0a53d213fbefebf28e79668a67338 /net/net_lib.scons
parent38993f6f15fb7b12ee4c973910369dc82a1a5595 (diff)
downloadchromium_src-332ff119039b7dd3ba3d1994dde0b077f015bc03.zip
chromium_src-332ff119039b7dd3ba3d1994dde0b077f015bc03.tar.gz
chromium_src-332ff119039b7dd3ba3d1994dde0b077f015bc03.tar.bz2
Initial Mac proxy implementation
Review URL: http://codereview.chromium.org/8671 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4221 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net_lib.scons')
-rw-r--r--net/net_lib.scons5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/net_lib.scons b/net/net_lib.scons
index 7db4aa7..82a82eb 100644
--- a/net/net_lib.scons
+++ b/net/net_lib.scons
@@ -89,7 +89,6 @@ input_files = [
'http/http_vary_data.cc',
'http/winhttp_request_throttle.cc',
'proxy/proxy_resolver_fixed.cc',
- 'proxy/proxy_resolver_winhttp.cc',
'proxy/proxy_service.cc',
'url_request/mime_sniffer_proxy.cc',
'url_request/url_request.cc',
@@ -123,7 +122,6 @@ if env['PLATFORM'] in ('posix', 'darwin'):
'base/winsock_init.cc',
'http/http_transaction_winhttp.cc',
'http/winhttp_request_throttle.cc',
- 'proxy/proxy_resolver_winhttp.cc',
'url_request/url_request_file_dir_job.cc',
'url_request/url_request_ftp_job.cc',
'url_request/url_request_inet_job.cc',
@@ -142,12 +140,15 @@ if env['PLATFORM'] == 'win32':
'disk_cache/file_win.cc',
'disk_cache/mapped_file_win.cc',
'disk_cache/os_file_win.cc',
+ 'proxy/proxy_resolver_winhttp.cc',
])
if env['PLATFORM'] == 'darwin':
input_files.extend([
'base/platform_mime_util_mac.mm',
+ 'base/ssl_client_socket_mac.cc',
'base/x509_certificate_mac.cc',
+ 'proxy/proxy_resolver_mac.cc',
])
if env['PLATFORM'] == 'posix':