Index: base/callback_list.h |
diff --git a/base/callback_list.h b/base/callback_list.h |
index ead92eadee345477046a5d1d95b40956d0e7ebe0..2db23b2da8c5b65145ea09344a82a6eb106bfc1a 100644 |
--- a/base/callback_list.h |
+++ b/base/callback_list.h |
@@ -45,6 +45,8 @@ |
// } |
// |
// base::CallbackList<void(const Foo&)> callback_list_; |
+// |
+// DISALLOW_COPY_AND_ASSIGN(MyWidget); |
// }; |
// |
// |
@@ -67,6 +69,8 @@ |
// |
// scoped_ptr<base::CallbackList<void(const Foo&)>::Subscription> |
// foo_subscription_; |
+// |
+// DISALLOW_COPY_AND_ASSIGN(MyWidgetListener); |
// }; |
namespace base { |
@@ -81,11 +85,12 @@ class CallbackListBase { |
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_); |
} |
@@ -145,8 +150,7 @@ class CallbackListBase { |
typename std::list<CallbackType>::iterator list_iter_; |
}; |
- CallbackListBase() |
- : active_iterator_count_(0) {} |
+ CallbackListBase() : active_iterator_count_(0) {} |
~CallbackListBase() { |
DCHECK_EQ(0, active_iterator_count_); |