diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-21 17:28:54 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-21 17:28:54 +0100 |
| commit | d77e7f37b175317d38b1e3067d27eba0584b93c6 (patch) | |
| tree | d56239fbbc6baa289e721050aa51267215f16969 /net | |
| parent | 74b084c38a376b8c8ee24cadcc3e65bfb4b47160 (diff) | |
| download | external_chromium-d77e7f37b175317d38b1e3067d27eba0584b93c6.zip external_chromium-d77e7f37b175317d38b1e3067d27eba0584b93c6.tar.gz external_chromium-d77e7f37b175317d38b1e3067d27eba0584b93c6.tar.bz2 | |
Remove the v8 dependecy from libchromium.
Also fixed the makefile a bit.
Change-Id: Ib63720dbd62d477657aa49a159f1b4f7956785d6
Diffstat (limited to 'net')
| -rw-r--r-- | net/proxy/proxy_service.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc index 06c90b1..0b88499 100644 --- a/net/proxy/proxy_service.cc +++ b/net/proxy/proxy_service.cc @@ -20,7 +20,9 @@ #include "net/proxy/proxy_config_service_fixed.h" #include "net/proxy/proxy_resolver.h" #include "net/proxy/proxy_resolver_js_bindings.h" +#ifndef ANDROID #include "net/proxy/proxy_resolver_v8.h" +#endif #include "net/proxy/proxy_script_fetcher.h" #include "net/proxy/sync_host_resolver_bridge.h" #include "net/url_request/url_request_context.h" @@ -160,6 +162,7 @@ class ProxyResolverFromPacString : public ProxyResolver { const std::string pac_string_; }; +#ifndef ANDROID // This factory creates V8ProxyResolvers with appropriate javascript bindings. class ProxyResolverFactoryForV8 : public ProxyResolverFactory { public: @@ -193,6 +196,7 @@ class ProxyResolverFactoryForV8 : public ProxyResolverFactory { MessageLoop* io_loop_; NetLog* net_log_; }; +#endif // Creates ProxyResolvers using a platform-specific implementation. class ProxyResolverFactoryForSystem : public ProxyResolverFactory { @@ -389,6 +393,7 @@ ProxyService::ProxyService(ProxyConfigService* config_service, ResetConfigService(config_service); } +#ifndef ANDROID // static ProxyService* ProxyService::CreateUsingV8ProxyResolver( ProxyConfigService* proxy_config_service, @@ -420,6 +425,7 @@ ProxyService* ProxyService::CreateUsingV8ProxyResolver( return proxy_service; } +#endif // static ProxyService* ProxyService::CreateUsingSystemProxyResolver( |