diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 21:48:54 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 21:48:54 +0000 |
| commit | 115288648041898b6d50f7d2e17391e2d1972a76 (patch) | |
| tree | eee67d927a7ebb40e87848924a8f26c5c5cb99ca /base/cancelable_callback.h | |
| parent | e91ac22d99252095839ca7c82c092972bd56445e (diff) | |
| download | chromium_src-115288648041898b6d50f7d2e17391e2d1972a76.zip chromium_src-115288648041898b6d50f7d2e17391e2d1972a76.tar.gz chromium_src-115288648041898b6d50f7d2e17391e2d1972a76.tar.bz2 | |
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
Diffstat (limited to 'base/cancelable_callback.h')
| -rw-r--r-- | base/cancelable_callback.h | 3 |
1 files changed, 2 insertions, 1 deletions
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<void(A1)> { } private: - void Forward(A1 a1) const { + void Forward( + typename internal::CallbackParamTraits<A1>::ForwardType a1) const { callback_.Run(a1); } |