Callback API Change: Allow Bind() to take a Callback<> and bind all its free parameters.

base/bind_internal.h

 // This file was GENERATED by command:
 //     pump.py bind_internal.h.pump
 // DO NOT EDIT BY HAND!!!
 
 
 
 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ skipping 1703 matching lines @@
     StorageType* invoker = static_cast<StorageType*>(base);
     typename StorageType::P1Traits::StorageType& weak_ptr = invoker->p1_;
     if (!weak_ptr.get()) {
       return;
     }
     (weak_ptr->*invoker->f_)(Unwrap(invoker->p2_), Unwrap(invoker->p3_),
         Unwrap(invoker->p4_), Unwrap(invoker->p5_), Unwrap(invoker->p6_));
   }
 };
 
+// BindMoreFuncN<>
+//
+// This set of functions help in fully binding the free parameters in a
+// Callback<>.
+template <typename Sig, typename P1>
+void BindMoreFunc1(const base::Callback<Sig>& callback, const P1& p1) {
+  callback.Run(p1);
+}
+
+template <typename Sig, typename P1, typename P2>
+void BindMoreFunc2(const base::Callback<Sig>& callback, const P1& p1,
+    const P2& p2) {
+  callback.Run(p1, p2);
+}
+
+template <typename Sig, typename P1, typename P2, typename P3>
+void BindMoreFunc3(const base::Callback<Sig>& callback, const P1& p1,
+    const P2& p2, const P3& p3) {
+  callback.Run(p1, p2, p3);
+}
+
+template <typename Sig, typename P1, typename P2, typename P3, typename P4>
+void BindMoreFunc4(const base::Callback<Sig>& callback, const P1& p1,
+    const P2& p2, const P3& p3, const P4& p4) {
+  callback.Run(p1, p2, p3, p4);
+}
+
+template <typename Sig, typename P1, typename P2, typename P3, typename P4,
+    typename P5>
+void BindMoreFunc5(const base::Callback<Sig>& callback, const P1& p1,
+    const P2& p2, const P3& p3, const P4& p4, const P5& p5) {
+  callback.Run(p1, p2, p3, p4, p5);
+}
+
+template <typename Sig, typename P1, typename P2, typename P3, typename P4,
+    typename P5, typename P6>
+void BindMoreFunc6(const base::Callback<Sig>& callback, const P1& p1,
+    const P2& p2, const P3& p3, const P4& p4, const P5& p5, const P6& p6) {
+  callback.Run(p1, p2, p3, p4, p5, p6);
+}
+
 // InvokerStorageN<>
 //
 // These are the actual storage classes for the Invokers.
 //
 // Though these types are "classes", they are being used as structs with
 // all member variable public.  We cannot make it a struct because it inherits
 // from a class which causes a compiler warning.  We cannot add a "Run()" method
 // that forwards the unbound arguments because that would require we unwrap the
 // Sig type like in InvokerN above to know the return type, and the arity
 // of Run().
@@ skipping 389 matching lines @@
   typename ParamTraits<P3>::StorageType p3_;
   typename ParamTraits<P4>::StorageType p4_;
   typename ParamTraits<P5>::StorageType p5_;
   typename ParamTraits<P6>::StorageType p6_;
 };
 
 }  // namespace internal
 }  // namespace base
 
 #endif  // BASE_BIND_INTERNAL_H_