diff options
| author | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-31 17:15:56 +0000 |
|---|---|---|
| committer | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-31 17:15:56 +0000 |
| commit | 153d44b69e23ac6e1ca2efa64ef5544f08cb8c71 (patch) | |
| tree | d998fd23a0dc7de5148c2b53b2a2769d4e4bddbc /net/net_lib.scons | |
| parent | 55209a4b0b801a3bc2f790d4a75d10ccfdf34f6e (diff) | |
| download | chromium_src-153d44b69e23ac6e1ca2efa64ef5544f08cb8c71.zip chromium_src-153d44b69e23ac6e1ca2efa64ef5544f08cb8c71.tar.gz chromium_src-153d44b69e23ac6e1ca2efa64ef5544f08cb8c71.tar.bz2 | |
Relanding of r4221, initial proxy support for the Mac
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4293 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net_lib.scons')
| -rw-r--r-- | net/net_lib.scons | 5 |
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': |