diff options
| author | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-28 07:09:43 +0000 |
|---|---|---|
| committer | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-28 07:09:43 +0000 |
| commit | dc0f06bb84048652e842c1d5baba907bd12b1c3f (patch) | |
| tree | 87560a623de75beca05b4b8eba12feaa7e939b17 /remoting | |
| parent | 51611aa93e3116dc284cbdcd03e2690d8571833c (diff) | |
| download | chromium_src-dc0f06bb84048652e842c1d5baba907bd12b1c3f.zip chromium_src-dc0f06bb84048652e842c1d5baba907bd12b1c3f.tar.gz chromium_src-dc0f06bb84048652e842c1d5baba907bd12b1c3f.tar.bz2 | |
Create ProxyConfigService on IOS in remoting/base/url_request_context.cc
Review URL: https://codereview.chromium.org/92823003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237726 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/base/url_request_context.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/remoting/base/url_request_context.cc b/remoting/base/url_request_context.cc index 9340230..60f620d 100644 --- a/remoting/base/url_request_context.cc +++ b/remoting/base/url_request_context.cc @@ -19,6 +19,8 @@ #if defined(OS_WIN) #include "net/proxy/proxy_config_service_win.h" +#elif defined(OS_IOS) +#include "net/proxy/proxy_config_service_ios.h" #elif defined(OS_MACOSX) #include "net/proxy/proxy_config_service_mac.h" #elif defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -47,8 +49,7 @@ net::ProxyConfigService* CreateSystemProxyConfigService( #if defined(OS_WIN) return new net::ProxyConfigServiceWin(); #elif defined(OS_IOS) - NOTREACHED() << "iOS is not a supported target for Chromoting host"; - return NULL; + return new net::ProxyConfigServiceIOS(); #elif defined(OS_MACOSX) return new net::ProxyConfigServiceMac(io_thread_task_runner); #elif defined(OS_CHROMEOS) |