summaryrefslogtreecommitdiffstats
path: root/chrome/browser/service/service_process_control.cc
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-27 02:44:27 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-27 02:44:27 +0000
commit4f5cd50ad11505a0171ec5f58ccc070893f3bf72 (patch)
treeaa8eb4e5732c30d20af9eb17f610d5fdeeee6ed1 /chrome/browser/service/service_process_control.cc
parenta6e77be9914de7c821bf6827cb432f42c4353686 (diff)
downloadchromium_src-4f5cd50ad11505a0171ec5f58ccc070893f3bf72.zip
chromium_src-4f5cd50ad11505a0171ec5f58ccc070893f3bf72.tar.gz
chromium_src-4f5cd50ad11505a0171ec5f58ccc070893f3bf72.tar.bz2
base::Bind: Convert ServiceProcessControl::CloudPrintProxyInfoHandler.
BUG=none TEST=none R=csilv@chromium.org Review URL: http://codereview.chromium.org/8403015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107523 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/service/service_process_control.cc')
-rw-r--r--chrome/browser/service/service_process_control.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/service/service_process_control.cc b/chrome/browser/service/service_process_control.cc
index 399b389..9ee7fde 100644
--- a/chrome/browser/service/service_process_control.cc
+++ b/chrome/browser/service/service_process_control.cc
@@ -220,17 +220,18 @@ void ServiceProcessControl::Observe(
void ServiceProcessControl::OnCloudPrintProxyInfo(
const cloud_print::CloudPrintProxyInfo& proxy_info) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- if (cloud_print_info_callback_ != NULL) {
- cloud_print_info_callback_->Run(proxy_info);
- cloud_print_info_callback_.reset();
+ if (!cloud_print_info_callback_.is_null()) {
+ cloud_print_info_callback_.Run(proxy_info);
+ cloud_print_info_callback_.Reset();
}
}
bool ServiceProcessControl::GetCloudPrintProxyInfo(
- CloudPrintProxyInfoHandler* cloud_print_info_callback) {
+ const CloudPrintProxyInfoHandler& cloud_print_info_callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- DCHECK(cloud_print_info_callback);
- cloud_print_info_callback_.reset(cloud_print_info_callback);
+ DCHECK_EQ(false, cloud_print_info_callback.is_null());
+
+ cloud_print_info_callback_ = cloud_print_info_callback;
return Send(new ServiceMsg_GetCloudPrintProxyInfo());
}