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

Unified Diff: net/proxy/proxy_service.cc

Issue 49009: Proxy config for Linux (ProxyConfigServiceLinux)... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 11 years, 9 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
Index: net/proxy/proxy_service.cc
===================================================================
--- net/proxy/proxy_service.cc (revision 12719)
+++ net/proxy/proxy_service.cc (working copy)
@@ -19,6 +19,8 @@
#include "net/proxy/proxy_resolver_winhttp.h"
#elif defined(OS_MACOSX)
#include "net/proxy/proxy_resolver_mac.h"
+#elif defined(OS_LINUX)
+#include "net/proxy/proxy_config_service_linux.h"
#endif
#include "net/proxy/proxy_resolver.h"
#include "net/proxy/proxy_resolver_v8.h"
@@ -205,12 +207,8 @@
return new ProxyService(new ProxyConfigServiceMac(),
new ProxyResolverMac());
#else
- // TODO(port): implement ProxyConfigServiceLinux as well as make use of
- // ProxyResolverV8 once it's implemented.
- // See:
- // - http://code.google.com/p/chromium/issues/detail?id=8143
- // - http://code.google.com/p/chromium/issues/detail?id=2764
- return CreateNull();
+ return new ProxyService(new ProxyConfigServiceLinux(),
+ new ProxyResolverV8());
#endif
}
@@ -230,9 +228,7 @@
#elif defined(OS_MACOSX)
config_service = new ProxyConfigServiceMac();
#else
- // TODO(port): implement ProxyConfigServiceLinux.
- // See: http://code.google.com/p/chromium/issues/detail?id=8143
- return CreateNull();
+ config_service = new ProxyConfigServiceLinux();
#endif
// Create a ProxyService that uses V8 to evaluate PAC scripts.
« net/proxy/proxy_config_service_linux.cc ('K') | « net/proxy/proxy_config_service_linux.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698