diff options
| author | droger@chromium.org <droger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-04 15:51:22 +0000 |
|---|---|---|
| committer | droger@chromium.org <droger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-04 15:51:22 +0000 |
| commit | 7444123fbbcfa5286f7d609f4d2dd60211e328ac (patch) | |
| tree | 0ccc29586a68f63eaee74ca3a74b290b8417a27f /net/proxy/proxy_resolver_mac.cc | |
| parent | b08fb0a4ed131d9d6425f3410b4618833b4a2f30 (diff) | |
| download | chromium_src-7444123fbbcfa5286f7d609f4d2dd60211e328ac.zip chromium_src-7444123fbbcfa5286f7d609f4d2dd60211e328ac.tar.gz chromium_src-7444123fbbcfa5286f7d609f4d2dd60211e328ac.tar.bz2 | |
Add iOS support to ProxyService
The iOS implementation is similar to the Mac implementation with the following
differences:
- the SCDynamicStore API does not exist on iOS, thus configuration changes are
only detected by polling
- several features are not supported.
BUG=145954
Review URL: https://chromiumcodereview.appspot.com/10882010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154758 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_resolver_mac.cc')
| -rw-r--r-- | net/proxy/proxy_resolver_mac.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/proxy/proxy_resolver_mac.cc b/net/proxy/proxy_resolver_mac.cc index b3e2f7e..a5a05af 100644 --- a/net/proxy/proxy_resolver_mac.cc +++ b/net/proxy/proxy_resolver_mac.cc @@ -5,7 +5,6 @@ #include "net/proxy/proxy_resolver_mac.h" #include <CoreFoundation/CoreFoundation.h> -#include <CoreServices/CoreServices.h> #include "base/logging.h" #include "base/mac/foundation_util.h" @@ -16,6 +15,12 @@ #include "net/proxy/proxy_info.h" #include "net/proxy/proxy_server.h" +#if defined(OS_IOS) +#include <CFNetwork/CFProxySupport.h> +#else +#include <CoreServices/CoreServices.h> +#endif + namespace { // Utility function to map a CFProxyType to a ProxyServer::Scheme. |