C++ Readability Review for caitkp

base/callback_list.h

 // This file was GENERATED by command:
 //     pump.py callback_list.h.pump
 // DO NOT EDIT BY HAND!!!
 
 
 // Copyright 2013 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.
 
 #ifndef BASE_CALLBACK_LIST_H_
@@ skipping 27 matching lines @@
 //   RegisterCallback(const OnFooCallback& cb) {
 //     return callback_list_.Add(cb);
 //   }
 //
 //  private:
 //   void NotifyFoo(const Foo& foo) {
 //      callback_list_.Notify(foo);
 //   }
 //
 //   base::CallbackList<void(const Foo&)> callback_list_;
+//
+//   DISALLOW_COPY_AND_ASSIGN(MyWidget);
 // };
 //
 //
 // class MyWidgetListener {
 //  public:
 //   MyWidgetListener::MyWidgetListener() {
 //     foo_subscription_ = MyWidget::GetCurrent()->RegisterCallback(
 //             base::Bind(&MyWidgetListener::OnFoo, this)));
 //   }
 //
 //   MyWidgetListener::~MyWidgetListener() {
 //      // Subscription gets deleted automatically and will deregister
 //      // the callback in the process.
 //   }
 //
 //  private:
 //   void OnFoo(const Foo& foo) {
 //     // Do something.
 //   }
 //
 //   scoped_ptr<base::CallbackList<void(const Foo&)>::Subscription>
 //       foo_subscription_;
+//
+//   DISALLOW_COPY_AND_ASSIGN(MyWidgetListener);
 // };
 
 namespace base {
 
 namespace internal {
 
 template <typename CallbackType>
 class CallbackListBase {
  public:
   class Subscription {
    public:
     Subscription(CallbackListBase<CallbackType>* list,
                  typename std::list<CallbackType>::iterator iter)
         : list_(list),
-          iter_(iter) {}
+          iter_(iter) {
+    }
 
     ~Subscription() {
       if (list_->active_iterator_count_)
-        (*iter_).Reset();
+        iter_->Reset();
       else
         list_->callbacks_.erase(iter_);
     }
 
    private:
     CallbackListBase<CallbackType>* list_;
     typename std::list<CallbackType>::iterator iter_;
 
     DISALLOW_COPY_AND_ASSIGN(Subscription);
   };
@@ skipping 39 matching lines @@
         ++list_iter_;
       }
       return cb;
     }
 
    private:
     CallbackListBase<CallbackType>* list_;
     typename std::list<CallbackType>::iterator list_iter_;
   };
 
-  CallbackListBase()
-      : active_iterator_count_(0) {}
+  CallbackListBase() : active_iterator_count_(0) {}
 
   ~CallbackListBase() {
     DCHECK_EQ(0, active_iterator_count_);
     DCHECK_EQ(0U, callbacks_.size());
   }
 
   // Returns an instance of a CallbackListBase::Iterator which can be used
   // to run callbacks.
   Iterator GetIterator() {
     return Iterator(this);
@@ skipping 27 matching lines @@
     : public internal::CallbackListBase<Callback<void(void)> > {
  public:
   typedef Callback<void(void)> CallbackType;
 
   CallbackList() {}
 
   void Notify() {
     internal::CallbackListBase<CallbackType>::Iterator it =
         this->GetIterator();
     CallbackType* cb;
-    while((cb = it.GetNext()) != NULL) {
+    while ((cb = it.GetNext()) != NULL) {
       cb->Run();
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CallbackList);
 };
 
 template <typename A1>
 class CallbackList<void(A1)>
-    : public internal::CallbackListBase<
-        Callback<void(A1)> > {
+    : public internal::CallbackListBase<Callback<void(A1)> > {
  public:
   typedef Callback<void(A1)> CallbackType;
 
   CallbackList() {}
 
   void Notify(typename internal::CallbackParamTraits<A1>::ForwardType a1) {
     typename internal::CallbackListBase<CallbackType>::Iterator it =
         this->GetIterator();
     CallbackType* cb;
-    while((cb = it.GetNext()) != NULL) {
+    while ((cb = it.GetNext()) != NULL) {
       cb->Run(a1);
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CallbackList);
 };
 
 template <typename A1, typename A2>
 class CallbackList<void(A1, A2)>
-    : public internal::CallbackListBase<
-        Callback<void(A1, A2)> > {
+    : public internal::CallbackListBase<Callback<void(A1, A2)> > {
  public:
   typedef Callback<void(A1, A2)> CallbackType;
 
   CallbackList() {}
 
   void Notify(typename internal::CallbackParamTraits<A1>::ForwardType a1,
               typename internal::CallbackParamTraits<A2>::ForwardType a2) {
     typename internal::CallbackListBase<CallbackType>::Iterator it =
         this->GetIterator();
     CallbackType* cb;
-    while((cb = it.GetNext()) != NULL) {
+    while ((cb = it.GetNext()) != NULL) {
       cb->Run(a1, a2);
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CallbackList);
 };
 
 template <typename A1, typename A2, typename A3>
 class CallbackList<void(A1, A2, A3)>
-    : public internal::CallbackListBase<
-        Callback<void(A1, A2, A3)> > {
+    : public internal::CallbackListBase<Callback<void(A1, A2, A3)> > {
  public:
   typedef Callback<void(A1, A2, A3)> CallbackType;
 
   CallbackList() {}
 
   void Notify(typename internal::CallbackParamTraits<A1>::ForwardType a1,
               typename internal::CallbackParamTraits<A2>::ForwardType a2,
               typename internal::CallbackParamTraits<A3>::ForwardType a3) {
     typename internal::CallbackListBase<CallbackType>::Iterator it =
         this->GetIterator();
     CallbackType* cb;
-    while((cb = it.GetNext()) != NULL) {
+    while ((cb = it.GetNext()) != NULL) {
       cb->Run(a1, a2, a3);
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CallbackList);
 };
 
 template <typename A1, typename A2, typename A3, typename A4>
 class CallbackList<void(A1, A2, A3, A4)>
-    : public internal::CallbackListBase<
-        Callback<void(A1, A2, A3, A4)> > {
+    : public internal::CallbackListBase<Callback<void(A1, A2, A3, A4)> > {
  public:
   typedef Callback<void(A1, A2, A3, A4)> CallbackType;
 
   CallbackList() {}
 
   void Notify(typename internal::CallbackParamTraits<A1>::ForwardType a1,
               typename internal::CallbackParamTraits<A2>::ForwardType a2,
               typename internal::CallbackParamTraits<A3>::ForwardType a3,
               typename internal::CallbackParamTraits<A4>::ForwardType a4) {
     typename internal::CallbackListBase<CallbackType>::Iterator it =
         this->GetIterator();
     CallbackType* cb;
-    while((cb = it.GetNext()) != NULL) {
+    while ((cb = it.GetNext()) != NULL) {
       cb->Run(a1, a2, a3, a4);
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CallbackList);
 };
 
 template <typename A1, typename A2, typename A3, typename A4, typename A5>
 class CallbackList<void(A1, A2, A3, A4, A5)>
-    : public internal::CallbackListBase<
-        Callback<void(A1, A2, A3, A4, A5)> > {
+    : public internal::CallbackListBase<Callback<void(A1, A2, A3, A4, A5)> > {
  public:
   typedef Callback<void(A1, A2, A3, A4, A5)> CallbackType;
 
   CallbackList() {}
 
   void Notify(typename internal::CallbackParamTraits<A1>::ForwardType a1,
               typename internal::CallbackParamTraits<A2>::ForwardType a2,
               typename internal::CallbackParamTraits<A3>::ForwardType a3,
               typename internal::CallbackParamTraits<A4>::ForwardType a4,
               typename internal::CallbackParamTraits<A5>::ForwardType a5) {
     typename internal::CallbackListBase<CallbackType>::Iterator it =
         this->GetIterator();
     CallbackType* cb;
-    while((cb = it.GetNext()) != NULL) {
+    while ((cb = it.GetNext()) != NULL) {
       cb->Run(a1, a2, a3, a4, a5);
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CallbackList);
 };
 
 template <typename A1, typename A2, typename A3, typename A4, typename A5,
     typename A6>
 class CallbackList<void(A1, A2, A3, A4, A5, A6)>
-    : public internal::CallbackListBase<
-        Callback<void(A1, A2, A3, A4, A5, A6)> > {
+    : public internal::CallbackListBase<Callback<void(A1, A2, A3, A4, A5,
+        A6)> > {
  public:
   typedef Callback<void(A1, A2, A3, A4, A5, A6)> CallbackType;
 
   CallbackList() {}
 
   void Notify(typename internal::CallbackParamTraits<A1>::ForwardType a1,
               typename internal::CallbackParamTraits<A2>::ForwardType a2,
               typename internal::CallbackParamTraits<A3>::ForwardType a3,
               typename internal::CallbackParamTraits<A4>::ForwardType a4,
               typename internal::CallbackParamTraits<A5>::ForwardType a5,
               typename internal::CallbackParamTraits<A6>::ForwardType a6) {
     typename internal::CallbackListBase<CallbackType>::Iterator it =
         this->GetIterator();
     CallbackType* cb;
-    while((cb = it.GetNext()) != NULL) {
+    while ((cb = it.GetNext()) != NULL) {
       cb->Run(a1, a2, a3, a4, a5, a6);
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CallbackList);
 };
 
 template <typename A1, typename A2, typename A3, typename A4, typename A5,
     typename A6, typename A7>
 class CallbackList<void(A1, A2, A3, A4, A5, A6, A7)>
-    : public internal::CallbackListBase<
-        Callback<void(A1, A2, A3, A4, A5, A6, A7)> > {
+    : public internal::CallbackListBase<Callback<void(A1, A2, A3, A4, A5, A6,
+        A7)> > {
  public:
   typedef Callback<void(A1, A2, A3, A4, A5, A6, A7)> CallbackType;
 
   CallbackList() {}
 
   void Notify(typename internal::CallbackParamTraits<A1>::ForwardType a1,
               typename internal::CallbackParamTraits<A2>::ForwardType a2,
               typename internal::CallbackParamTraits<A3>::ForwardType a3,
               typename internal::CallbackParamTraits<A4>::ForwardType a4,
               typename internal::CallbackParamTraits<A5>::ForwardType a5,
               typename internal::CallbackParamTraits<A6>::ForwardType a6,
               typename internal::CallbackParamTraits<A7>::ForwardType a7) {
     typename internal::CallbackListBase<CallbackType>::Iterator it =
         this->GetIterator();
     CallbackType* cb;
-    while((cb = it.GetNext()) != NULL) {
+    while ((cb = it.GetNext()) != NULL) {
       cb->Run(a1, a2, a3, a4, a5, a6, a7);
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CallbackList);
 };
 
 }  // namespace base
 
 #endif  // BASE_CALLBACK_LIST_H_