summaryrefslogtreecommitdiffstats
path: root/gin
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-12 13:18:52 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-12 13:18:52 +0000
commiteca94d0831bafc1f060f0101796b9222d0e7de7a (patch)
treebf4df65665c1802f8a6516e9af05802f061cf6bc /gin
parentd78b3a03a70b9426d9844fb14c61f9f44c2219b5 (diff)
downloadchromium_src-eca94d0831bafc1f060f0101796b9222d0e7de7a.zip
chromium_src-eca94d0831bafc1f060f0101796b9222d0e7de7a.tar.gz
chromium_src-eca94d0831bafc1f060f0101796b9222d0e7de7a.tar.bz2
Update function_template.h.pump file after changes in r240271
TBR=dcarney@chromium.org BUG=none Review URL: https://codereview.chromium.org/106433005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240293 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gin')
-rw-r--r--gin/function_template.h.pump7
1 files changed, 5 insertions, 2 deletions
diff --git a/gin/function_template.h.pump b/gin/function_template.h.pump
index 66c2263..f9ae5ff 100644
--- a/gin/function_template.h.pump
+++ b/gin/function_template.h.pump
@@ -62,8 +62,11 @@ struct CallbackParamTraits<const T*> {
// This simple base class is used so that we can share a single object template
// among every CallbackHolder instance.
class CallbackHolderBase : public Wrappable<CallbackHolderBase> {
+ public:
+ static WrapperInfo kWrapperInfo;
+
protected:
- ~CallbackHolderBase() {}
+ virtual ~CallbackHolderBase() {}
};
template<typename Sig>
@@ -74,7 +77,7 @@ class CallbackHolder : public CallbackHolderBase {
base::Callback<Sig> callback;
int flags;
private:
- ~CallbackHolder() {}
+ virtual ~CallbackHolder() {}
};