From 115288648041898b6d50f7d2e17391e2d1972a76 Mon Sep 17 00:00:00 2001 From: "sail@chromium.org" Date: Wed, 14 Dec 2011 21:48:54 +0000 Subject: Revert 114494 - Remove BindStateHolder and have Bind() return a Callback<> object directly. This removes some complexity and also fixes a bug where if you call Bind() with the result of Bind(), the resulting Callback would only be valid during the first call. Ouch. BUG=none TEST=new unittests Review URL: http://codereview.chromium.org/8738001 TBR=ajwong@chromium.org Review URL: http://codereview.chromium.org/8914022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114495 0039d316-1c4b-4281-b951-d872f2087c98 --- base/cancelable_callback.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'base/cancelable_callback.h') diff --git a/base/cancelable_callback.h b/base/cancelable_callback.h index 4de7d12..b432f61 100644 --- a/base/cancelable_callback.h +++ b/base/cancelable_callback.h @@ -173,7 +173,8 @@ class CancelableCallback { } private: - void Forward(A1 a1) const { + void Forward( + typename internal::CallbackParamTraits::ForwardType a1) const { callback_.Run(a1); } -- cgit v1.1