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

Unified Diff: net/proxy/proxy_script_fetcher_impl.h

Issue 6831025: Adds support for the DHCP portion of the WPAD (proxy auto-discovery) protocol. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add timeout on Win32 DHCP API. Created 9 years, 8 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_script_fetcher_impl.h
diff --git a/net/proxy/proxy_script_fetcher_impl.h b/net/proxy/proxy_script_fetcher_impl.h
index 419293f98e21e7413e25b1d323730e8bd8c892f4..6be7c85906fcdfd2897c2bcec895b00cc86374d5 100644
--- a/net/proxy/proxy_script_fetcher_impl.h
+++ b/net/proxy/proxy_script_fetcher_impl.h
@@ -24,7 +24,7 @@ class URLRequestContext;
// Implementation of ProxyScriptFetcher that downloads scripts using the
// specified request context.
-class ProxyScriptFetcherImpl : public ProxyScriptFetcher,
+class ProxyScriptFetcherImpl : public URLProxyScriptFetcher,
public URLRequest::Delegate {
public:
// Creates a ProxyScriptFetcher that issues requests through
@@ -43,11 +43,11 @@ class ProxyScriptFetcherImpl : public ProxyScriptFetcher,
virtual void OnResponseCompleted(URLRequest* request);
- // ProxyScriptFetcher methods:
- virtual int Fetch(const GURL& url, string16* text,
- CompletionCallback* callback);
- virtual void Cancel();
- virtual URLRequestContext* GetRequestContext();
+ // URLProxyScriptFetcher methods:
+ virtual int Fetch(string16* text, CompletionCallback* callback) OVERRIDE;
+ virtual void Cancel() OVERRIDE;
+ virtual URLRequestContext* GetRequestContext() const OVERRIDE;
+ virtual void SetURL(const GURL& url) OVERRIDE;
// URLRequest::Delegate methods:
virtual void OnAuthRequired(URLRequest* request,
@@ -84,6 +84,10 @@ class ProxyScriptFetcherImpl : public ProxyScriptFetcher,
// The context used for making network requests.
URLRequestContext* url_request_context_;
+ // The URL that should be fetched. Valid only after |SetURL()| has been
+ // called.
+ GURL url_;
+
// Buffer that URLRequest writes into.
scoped_refptr<IOBuffer> buf_;

Powered by Google App Engine
This is Rietveld 408576698