diff options
author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 00:10:04 +0000 |
---|---|---|
committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 00:10:04 +0000 |
commit | e24f876c537646cab5a9e8492658f570ccd7da4a (patch) | |
tree | 85aa283d18c10b47f1e3acbafce3283661407477 /base/cancelable_callback.h | |
parent | b538d7ea0b2484074dea680d60f7f68750d1d1e3 (diff) | |
download | chromium_src-e24f876c537646cab5a9e8492658f570ccd7da4a.zip chromium_src-e24f876c537646cab5a9e8492658f570ccd7da4a.tar.gz chromium_src-e24f876c537646cab5a9e8492658f570ccd7da4a.tar.bz2 |
Retry 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.
Also makes the static type checking a bit more strict when assigning into a Callback<>.
BUG=none
TEST=new unittests
Review URL: http://codereview.chromium.org/8915024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115045 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/cancelable_callback.h')
-rw-r--r-- | base/cancelable_callback.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/base/cancelable_callback.h b/base/cancelable_callback.h index b432f61..4de7d12 100644 --- a/base/cancelable_callback.h +++ b/base/cancelable_callback.h @@ -173,8 +173,7 @@ class CancelableCallback<void(A1)> { } private: - void Forward( - typename internal::CallbackParamTraits<A1>::ForwardType a1) const { + void Forward(A1 a1) const { callback_.Run(a1); } |