diff options
| author | sdoyon@chromium.org <sdoyon@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-20 16:50:56 +0000 |
|---|---|---|
| committer | sdoyon@chromium.org <sdoyon@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-20 16:50:56 +0000 |
| commit | 861c6c6d56add9157e04aa2ac43bec8e33bf1cc1 (patch) | |
| tree | 835dd6466912cd073e3ac16177252fe0c8865c93 /net/proxy/proxy_service.cc | |
| parent | bc1529bbafc42d96d9ac0839bcb0ba1ab9328445 (diff) | |
| download | chromium_src-861c6c6d56add9157e04aa2ac43bec8e33bf1cc1.zip chromium_src-861c6c6d56add9157e04aa2ac43bec8e33bf1cc1.tar.gz chromium_src-861c6c6d56add9157e04aa2ac43bec8e33bf1cc1.tar.bz2 | |
ProxyConfigService for Linux.
Establishes a ProxyConfig by reading settings from gconf or consulting
environment variables.
BUG=8143
Thanks to ermilov.maxim@gmail.com for his contribution: some ideas<
and code snippets from his patch were folded into this one.
(See http://codereview.chromium.org/49009)
Review URL: http://codereview.chromium.org/60009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14034 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_service.cc')
| -rw-r--r-- | net/proxy/proxy_service.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc index c8e8a7a..bc4378e 100644 --- a/net/proxy/proxy_service.cc +++ b/net/proxy/proxy_service.cc @@ -18,6 +18,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" @@ -203,12 +205,10 @@ ProxyService* ProxyService::Create(const ProxyInfo* pi) { #elif defined(OS_MACOSX) return new ProxyService(new ProxyConfigServiceMac(), new ProxyResolverMac()); +#elif defined(OS_LINUX) + // On Linux we use the V8Resolver, no fallback implementation. + return CreateNull(); #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(); #endif } @@ -228,9 +228,9 @@ ProxyService* ProxyService::CreateUsingV8Resolver( config_service = new ProxyConfigServiceWin(); #elif defined(OS_MACOSX) config_service = new ProxyConfigServiceMac(); +#elif defined(OS_LINUX) + config_service = new ProxyConfigServiceLinux(); #else - // TODO(port): implement ProxyConfigServiceLinux. - // See: http://code.google.com/p/chromium/issues/detail?id=8143 return CreateNull(); #endif |