diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-14 04:54:46 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-14 04:54:46 +0000 |
commit | 684970b638fbfe1a2137fd162f630c86d2859828 (patch) | |
tree | b74fafda6801aa5c9e8746c230b8a2880a1de585 /net/proxy/proxy_service.h | |
parent | c4deb899d3293782beeb8d83eefc226a5fb1813e (diff) | |
download | chromium_src-684970b638fbfe1a2137fd162f630c86d2859828.zip chromium_src-684970b638fbfe1a2137fd162f630c86d2859828.tar.gz chromium_src-684970b638fbfe1a2137fd162f630c86d2859828.tar.bz2 |
LoadLog is used as an output parameter, reorder it to the last parameter.
Review URL: http://codereview.chromium.org/164531
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23419 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_service.h')
-rw-r--r-- | net/proxy/proxy_service.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h index 12b5262..994cb5a 100644 --- a/net/proxy/proxy_service.h +++ b/net/proxy/proxy_service.h @@ -64,11 +64,11 @@ class ProxyService { // 3. named proxy // // Profiling information for the request is saved to |load_log| if non-NULL. - int ResolveProxy(LoadLog* load_log, - const GURL& url, + int ResolveProxy(const GURL& url, ProxyInfo* results, CompletionCallback* callback, - PacRequest** pac_request); + PacRequest** pac_request, + LoadLog* load_log); // This method is called after a failure to connect or resolve a host name. // It gives the proxy service an opportunity to reconsider the proxy to use. @@ -82,11 +82,11 @@ class ProxyService { // Returns ERR_FAILED if there is not another proxy config to try. // // Profiling information for the request is saved to |load_log| if non-NULL. - int ReconsiderProxyAfterError(LoadLog* load_log, - const GURL& url, + int ReconsiderProxyAfterError(const GURL& url, ProxyInfo* results, CompletionCallback* callback, - PacRequest** pac_request); + PacRequest** pac_request, + LoadLog* load_log); // Call this method with a non-null |pac_request| to cancel the PAC request. void CancelPacRequest(PacRequest* pac_request); @@ -266,14 +266,13 @@ class SyncProxyServiceHelper SyncProxyServiceHelper(MessageLoop* io_message_loop, ProxyService* proxy_service); - int ResolveProxy(LoadLog* load_log, const GURL& url, ProxyInfo* proxy_info); - int ReconsiderProxyAfterError(LoadLog* load_log, - const GURL& url, - ProxyInfo* proxy_info); + int ResolveProxy(const GURL& url, ProxyInfo* proxy_info, LoadLog* load_log); + int ReconsiderProxyAfterError(const GURL& url, + ProxyInfo* proxy_info, LoadLog* load_log); private: - void StartAsyncResolve(LoadLog* load_log, const GURL& url); - void StartAsyncReconsider(LoadLog* load_log, const GURL& url); + void StartAsyncResolve(const GURL& url, LoadLog* load_log); + void StartAsyncReconsider(const GURL& url, LoadLog* load_log); void OnCompletion(int result); |