Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(618)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/proxy/proxy_service.cc

Issue 10882010: Add iOS support to ProxyService (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Cleanup Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/proxy/proxy_config_service_ios.cc ('K') | « net/proxy/proxy_resolver_mac.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_service.cc
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index 7decae83d91aefc034e69ca75935ffde6e45254d..05528af091c4883d703b856987c22b0647d560cf 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -36,6 +36,9 @@
#if defined(OS_WIN)
#include "net/proxy/proxy_config_service_win.h"
#include "net/proxy/proxy_resolver_winhttp.h"
+#elif defined(OS_IOS)
+#include "net/proxy/proxy_config_service_ios.h"
+#include "net/proxy/proxy_resolver_mac.h"
#elif defined(OS_MACOSX)
#include "net/proxy/proxy_config_service_mac.h"
#include "net/proxy/proxy_resolver_mac.h"
@@ -1408,6 +1411,8 @@ ProxyConfigService* ProxyService::CreateSystemProxyConfigService(
MessageLoop* file_loop) {
#if defined(OS_WIN)
return new ProxyConfigServiceWin();
+#elif defined(OS_IOS)
+ return new ProxyConfigServiceIOS(io_thread_task_runner);
#elif defined(OS_MACOSX)
return new ProxyConfigServiceMac(io_thread_task_runner);
#elif defined(OS_CHROMEOS)
« net/proxy/proxy_config_service_ios.cc ('K') | « net/proxy/proxy_resolver_mac.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698