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

Unified Diff: net/proxy/proxy_script_fetcher.cc

Issue 160510: Better match IE's proxy settings.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix merge conflict Created 11 years, 4 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
« no previous file with comments | « net/proxy/proxy_script_fetcher.h ('k') | net/proxy/proxy_script_fetcher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_script_fetcher.cc
===================================================================
--- net/proxy/proxy_script_fetcher.cc (revision 22399)
+++ net/proxy/proxy_script_fetcher.cc (working copy)
@@ -57,8 +57,8 @@
// ProxyScriptFetcher methods:
- virtual void Fetch(const GURL& url, std::string* bytes,
- CompletionCallback* callback);
+ virtual int Fetch(const GURL& url, std::string* bytes,
+ CompletionCallback* callback);
virtual void Cancel();
// URLRequest::Delegate methods:
@@ -137,9 +137,9 @@
// ensure that the delegate (this) is not called again.
}
-void ProxyScriptFetcherImpl::Fetch(const GURL& url,
- std::string* bytes,
- CompletionCallback* callback) {
+int ProxyScriptFetcherImpl::Fetch(const GURL& url,
+ std::string* bytes,
+ CompletionCallback* callback) {
// It is invalid to call Fetch() while a request is already in progress.
DCHECK(!cur_request_.get());
@@ -171,6 +171,7 @@
// Start the request.
cur_request_->Start();
+ return ERR_IO_PENDING;
}
void ProxyScriptFetcherImpl::Cancel() {
« no previous file with comments | « net/proxy/proxy_script_fetcher.h ('k') | net/proxy/proxy_script_fetcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698