diff options
| author | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-11 15:40:23 +0000 |
|---|---|---|
| committer | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-11 15:40:23 +0000 |
| commit | 928fb58bd99536f16df3739329cbade0853b3309 (patch) | |
| tree | 7a6433d25d9c5303614f05b6b39cb49e60468d12 /webkit/glue/plugins/mozilla_extensions.cc | |
| parent | 6723f835ff0247e5bffad9e92d8d42a8c3ae1b3b (diff) | |
| download | chromium_src-928fb58bd99536f16df3739329cbade0853b3309.zip chromium_src-928fb58bd99536f16df3739329cbade0853b3309.tar.gz chromium_src-928fb58bd99536f16df3739329cbade0853b3309.tar.bz2 | |
Rename HttpProxy* classes to Proxy*. Move them into a net/proxy/ subdirectory.
I'm making this change because proxy resolution is really not specific to the HTTP protocol. We need to use the proxy service in our FTP implementation, for example. I made a separate directory instead of just putting these in base, because I anticipate more files once we have our own PAC implementation.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@651 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins/mozilla_extensions.cc')
| -rw-r--r-- | webkit/glue/plugins/mozilla_extensions.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/webkit/glue/plugins/mozilla_extensions.cc b/webkit/glue/plugins/mozilla_extensions.cc index efda1df..9b336c3 100644 --- a/webkit/glue/plugins/mozilla_extensions.cc +++ b/webkit/glue/plugins/mozilla_extensions.cc @@ -38,8 +38,8 @@ #include "base/string_util.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" -#include "net/http/http_proxy_service.h" -#include "net/http/http_proxy_resolver_winhttp.h" +#include "net/proxy/proxy_service.h" +#include "net/proxy/proxy_resolver_winhttp.h" #include "third_party/npapi/bindings/npapi.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/plugins/plugin_instance.h" @@ -70,9 +70,9 @@ bool MozillaExtensionApi::FindProxyForUrl(const char* url, return result; } - net::HttpProxyResolverWinHttp proxy_resolver; - net::HttpProxyService proxy_service(&proxy_resolver); - net::HttpProxyInfo proxy_info; + net::ProxyResolverWinHttp proxy_resolver; + net::ProxyService proxy_service(&proxy_resolver); + net::ProxyInfo proxy_info; if (proxy_service.ResolveProxy(GURL(std::string(url)), &proxy_info, |