summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_service.h
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-01 20:38:10 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-01 20:38:10 +0000
commitf1f3f0f8af3740ec2afaebcaed410950a9cc0ac8 (patch)
tree6ccdd87ccfc89adbcb372c517559fa61fbc6c6b2 /net/proxy/proxy_service.h
parentd1666539b57bf8552e203d355fd09909d36f9732 (diff)
downloadchromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.zip
chromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.tar.gz
chromium_src-f1f3f0f8af3740ec2afaebcaed410950a9cc0ac8.tar.bz2
Begin CompletionCallback switchover.
Rename CompletionCallback to OldCompletionCallback in preparation for introducing a new CompletionCallback based on base::Callback. Also renames other CompletionCallback types like CancelableCompletionCallback and TestCompletionCallback and CompletionCallbackImpl. All using sed with s/CompletionCallback/OldCompletionCallback/g. BUG=98719 TEST=none Review URL: http://codereview.chromium.org/8070013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_service.h')
-rw-r--r--net/proxy/proxy_service.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h
index cc308dd..e37b959 100644
--- a/net/proxy/proxy_service.h
+++ b/net/proxy/proxy_service.h
@@ -75,7 +75,7 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
// Profiling information for the request is saved to |net_log| if non-NULL.
int ResolveProxy(const GURL& url,
ProxyInfo* results,
- CompletionCallback* callback,
+ OldCompletionCallback* callback,
PacRequest** pac_request,
const BoundNetLog& net_log);
@@ -93,7 +93,7 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
// Profiling information for the request is saved to |net_log| if non-NULL.
int ReconsiderProxyAfterError(const GURL& url,
ProxyInfo* results,
- CompletionCallback* callback,
+ OldCompletionCallback* callback,
PacRequest** pac_request,
const BoundNetLog& net_log);
@@ -338,7 +338,7 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
scoped_ptr<DhcpProxyScriptFetcher> dhcp_proxy_script_fetcher_;
// Callback for when |init_proxy_resolver_| is done.
- CompletionCallbackImpl<ProxyService> init_proxy_resolver_callback_;
+ OldCompletionCallbackImpl<ProxyService> init_proxy_resolver_callback_;
// Helper to download the PAC script (wpad + custom) and apply fallback rules.
//
@@ -394,7 +394,7 @@ class NET_EXPORT SyncProxyServiceHelper
ProxyService* proxy_service_;
base::WaitableEvent event_;
- CompletionCallbackImpl<SyncProxyServiceHelper> callback_;
+ OldCompletionCallbackImpl<SyncProxyServiceHelper> callback_;
ProxyInfo proxy_info_;
int result_;
};