Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1934)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/callback_list.h

Issue 24648002: Rename CallbackRegistry to CallbackList (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Doc fix Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/base.gypi ('k') | base/callback_list.h.pump » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/callback_list.h
diff --git a/base/callback_registry.h b/base/callback_list.h
similarity index 72%
rename from base/callback_registry.h
rename to base/callback_list.h
index dcdeb81d01eb9b260baf9cddbc72760d57a84131..ead92eadee345477046a5d1d95b40956d0e7ebe0 100644
--- a/base/callback_registry.h
+++ b/base/callback_list.h
@@ -1,5 +1,5 @@
// This file was GENERATED by command:
-// pump.py callback_registry.h.pump
+// pump.py callback_list.h.pump
// DO NOT EDIT BY HAND!!!
@@ -7,8 +7,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef BASE_CALLBACK_REGISTRY_H_
-#define BASE_CALLBACK_REGISTRY_H_
+#ifndef BASE_CALLBACK_LIST_H_
+#define BASE_CALLBACK_LIST_H_
#include <list>
@@ -34,17 +34,17 @@
//
// typedef base::Callback<void(const Foo&)> OnFooCallback;
//
-// scoped_ptr<base::CallbackRegistry<void(const Foo&)>::Subscription>
+// scoped_ptr<base::CallbackList<void(const Foo&)>::Subscription>
// RegisterCallback(const OnFooCallback& cb) {
-// return callback_registry_.Add(cb);
+// return callback_list_.Add(cb);
// }
//
// private:
// void NotifyFoo(const Foo& foo) {
-// callback_registry_.Notify(foo);
+// callback_list_.Notify(foo);
// }
//
-// base::CallbackRegistry<void(const Foo&)> callback_registry_;
+// base::CallbackList<void(const Foo&)> callback_list_;
// };
//
//
@@ -65,7 +65,7 @@
// // Do something.
// }
//
-// scoped_ptr<base::CallbackRegistry<void(const Foo&)>::Subscription>
+// scoped_ptr<base::CallbackList<void(const Foo&)>::Subscription>
// foo_subscription_;
// };
@@ -74,11 +74,11 @@ namespace base {
namespace internal {
template <typename CallbackType>
-class CallbackRegistryBase {
+class CallbackListBase {
public:
class Subscription {
public:
- Subscription(CallbackRegistryBase<CallbackType>* list,
+ Subscription(CallbackListBase<CallbackType>* list,
typename std::list<CallbackType>::iterator iter)
: list_(list),
iter_(iter) {}
@@ -91,7 +91,7 @@ class CallbackRegistryBase {
}
private:
- CallbackRegistryBase<CallbackType>* list_;
+ CallbackListBase<CallbackType>* list_;
typename std::list<CallbackType>::iterator iter_;
DISALLOW_COPY_AND_ASSIGN(Subscription);
@@ -99,7 +99,7 @@ class CallbackRegistryBase {
// Add a callback to the list. The callback will remain registered until the
// returned Subscription is destroyed, which must occur before the
- // CallbackRegistry is destroyed.
+ // CallbackList is destroyed.
scoped_ptr<Subscription> Add(const CallbackType& cb) {
DCHECK(!cb.is_null());
return scoped_ptr<Subscription>(
@@ -110,7 +110,7 @@ class CallbackRegistryBase {
// An iterator class that can be used to access the list of callbacks.
class Iterator {
public:
- explicit Iterator(CallbackRegistryBase<CallbackType>* list)
+ explicit Iterator(CallbackListBase<CallbackType>* list)
: list_(list),
list_iter_(list_->callbacks_.begin()) {
++list_->active_iterator_count_;
@@ -141,19 +141,19 @@ class CallbackRegistryBase {
}
private:
- CallbackRegistryBase<CallbackType>* list_;
+ CallbackListBase<CallbackType>* list_;
typename std::list<CallbackType>::iterator list_iter_;
};
- CallbackRegistryBase()
+ CallbackListBase()
: active_iterator_count_(0) {}
- ~CallbackRegistryBase() {
+ ~CallbackListBase() {
DCHECK_EQ(0, active_iterator_count_);
DCHECK_EQ(0U, callbacks_.size());
}
- // Returns an instance of a CallbackRegistryBase::Iterator which can be used
+ // Returns an instance of a CallbackListBase::Iterator which can be used
// to run callbacks.
Iterator GetIterator() {
return Iterator(this);
@@ -175,23 +175,23 @@ class CallbackRegistryBase {
std::list<CallbackType> callbacks_;
int active_iterator_count_;
- DISALLOW_COPY_AND_ASSIGN(CallbackRegistryBase);
+ DISALLOW_COPY_AND_ASSIGN(CallbackListBase);
};
} // namespace internal
-template <typename Sig> class CallbackRegistry;
+template <typename Sig> class CallbackList;
template <>
-class CallbackRegistry<void(void)>
- : public internal::CallbackRegistryBase<Callback<void(void)> > {
+class CallbackList<void(void)>
+ : public internal::CallbackListBase<Callback<void(void)> > {
public:
typedef Callback<void(void)> CallbackType;
- CallbackRegistry() {}
+ CallbackList() {}
void Notify() {
- internal::CallbackRegistryBase<CallbackType>::Iterator it =
+ internal::CallbackListBase<CallbackType>::Iterator it =
this->GetIterator();
CallbackType* cb;
while((cb = it.GetNext()) != NULL) {
@@ -200,20 +200,20 @@ class CallbackRegistry<void(void)>
}
private:
- DISALLOW_COPY_AND_ASSIGN(CallbackRegistry);
+ DISALLOW_COPY_AND_ASSIGN(CallbackList);
};
template <typename A1>
-class CallbackRegistry<void(A1)>
- : public internal::CallbackRegistryBase<
- Callback<void(A1)> > {
+class CallbackList<void(A1)>
+ : public internal::CallbackListBase<
+ Callback<void(A1)> > {
public:
typedef Callback<void(A1)> CallbackType;
- CallbackRegistry() {}
+ CallbackList() {}
void Notify(typename internal::CallbackParamTraits<A1>::ForwardType a1) {
- typename internal::CallbackRegistryBase<CallbackType>::Iterator it =
+ typename internal::CallbackListBase<CallbackType>::Iterator it =
this->GetIterator();
CallbackType* cb;
while((cb = it.GetNext()) != NULL) {
@@ -222,21 +222,21 @@ class CallbackRegistry<void(A1)>
}
private:
- DISALLOW_COPY_AND_ASSIGN(CallbackRegistry);
+ DISALLOW_COPY_AND_ASSIGN(CallbackList);
};
template <typename A1, typename A2>
-class CallbackRegistry<void(A1, A2)>
- : public internal::CallbackRegistryBase<
- Callback<void(A1, A2)> > {
+class CallbackList<void(A1, A2)>
+ : public internal::CallbackListBase<
+ Callback<void(A1, A2)> > {
public:
typedef Callback<void(A1, A2)> CallbackType;
- CallbackRegistry() {}
+ CallbackList() {}
void Notify(typename internal::CallbackParamTraits<A1>::ForwardType a1,
typename internal::CallbackParamTraits<A2>::ForwardType a2) {
- typename internal::CallbackRegistryBase<CallbackType>::Iterator it =
+ typename internal::CallbackListBase<CallbackType>::Iterator it =
this->GetIterator();
CallbackType* cb;
while((cb = it.GetNext()) != NULL) {
@@ -245,22 +245,22 @@ class CallbackRegistry<void(A1, A2)>
}
private:
- DISALLOW_COPY_AND_ASSIGN(CallbackRegistry);
+ DISALLOW_COPY_AND_ASSIGN(CallbackList);
};
template <typename A1, typename A2, typename A3>
-class CallbackRegistry<void(A1, A2, A3)>
- : public internal::CallbackRegistryBase<
- Callback<void(A1, A2, A3)> > {
+class CallbackList<void(A1, A2, A3)>
+ : public internal::CallbackListBase<
+ Callback<void(A1, A2, A3)> > {
public:
typedef Callback<void(A1, A2, A3)> CallbackType;
- CallbackRegistry() {}
+ CallbackList() {}
void Notify(typename internal::CallbackParamTraits<A1>::ForwardType a1,
typename internal::CallbackParamTraits<A2>::ForwardType a2,
typename internal::CallbackParamTraits<A3>::ForwardType a3) {
- typename internal::CallbackRegistryBase<CallbackType>::Iterator it =
+ typename internal::CallbackListBase<CallbackType>::Iterator it =
this->GetIterator();
CallbackType* cb;
while((cb = it.GetNext()) != NULL) {
@@ -269,23 +269,23 @@ class CallbackRegistry<void(A1, A2, A3)>
}
private:
- DISALLOW_COPY_AND_ASSIGN(CallbackRegistry);
+ DISALLOW_COPY_AND_ASSIGN(CallbackList);
};
template <typename A1, typename A2, typename A3, typename A4>
-class CallbackRegistry<void(A1, A2, A3, A4)>
- : public internal::CallbackRegistryBase<
- Callback<void(A1, A2, A3, A4)> > {
+class CallbackList<void(A1, A2, A3, A4)>
+ : public internal::CallbackListBase<
+ Callback<void(A1, A2, A3, A4)> > {
public:
typedef Callback<void(A1, A2, A3, A4)> CallbackType;
- CallbackRegistry() {}
+ 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::CallbackRegistryBase<CallbackType>::Iterator it =
+ typename internal::CallbackListBase<CallbackType>::Iterator it =
this->GetIterator();
CallbackType* cb;
while((cb = it.GetNext()) != NULL) {
@@ -294,24 +294,24 @@ class CallbackRegistry<void(A1, A2, A3, A4)>
}
private:
- DISALLOW_COPY_AND_ASSIGN(CallbackRegistry);
+ DISALLOW_COPY_AND_ASSIGN(CallbackList);
};
template <typename A1, typename A2, typename A3, typename A4, typename A5>
-class CallbackRegistry<void(A1, A2, A3, A4, A5)>
- : public internal::CallbackRegistryBase<
- Callback<void(A1, A2, A3, A4, A5)> > {
+class CallbackList<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;
- CallbackRegistry() {}
+ 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::CallbackRegistryBase<CallbackType>::Iterator it =
+ typename internal::CallbackListBase<CallbackType>::Iterator it =
this->GetIterator();
CallbackType* cb;
while((cb = it.GetNext()) != NULL) {
@@ -320,18 +320,18 @@ class CallbackRegistry<void(A1, A2, A3, A4, A5)>
}
private:
- DISALLOW_COPY_AND_ASSIGN(CallbackRegistry);
+ DISALLOW_COPY_AND_ASSIGN(CallbackList);
};
template <typename A1, typename A2, typename A3, typename A4, typename A5,
typename A6>
-class CallbackRegistry<void(A1, A2, A3, A4, A5, A6)>
- : public internal::CallbackRegistryBase<
- Callback<void(A1, A2, A3, A4, A5, A6)> > {
+class CallbackList<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;
- CallbackRegistry() {}
+ CallbackList() {}
void Notify(typename internal::CallbackParamTraits<A1>::ForwardType a1,
typename internal::CallbackParamTraits<A2>::ForwardType a2,
@@ -339,7 +339,7 @@ class CallbackRegistry<void(A1, A2, A3, A4, A5, A6)>
typename internal::CallbackParamTraits<A4>::ForwardType a4,
typename internal::CallbackParamTraits<A5>::ForwardType a5,
typename internal::CallbackParamTraits<A6>::ForwardType a6) {
- typename internal::CallbackRegistryBase<CallbackType>::Iterator it =
+ typename internal::CallbackListBase<CallbackType>::Iterator it =
this->GetIterator();
CallbackType* cb;
while((cb = it.GetNext()) != NULL) {
@@ -348,18 +348,18 @@ class CallbackRegistry<void(A1, A2, A3, A4, A5, A6)>
}
private:
- DISALLOW_COPY_AND_ASSIGN(CallbackRegistry);
+ DISALLOW_COPY_AND_ASSIGN(CallbackList);
};
template <typename A1, typename A2, typename A3, typename A4, typename A5,
typename A6, typename A7>
-class CallbackRegistry<void(A1, A2, A3, A4, A5, A6, A7)>
- : public internal::CallbackRegistryBase<
- Callback<void(A1, A2, A3, A4, A5, A6, A7)> > {
+class CallbackList<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;
- CallbackRegistry() {}
+ CallbackList() {}
void Notify(typename internal::CallbackParamTraits<A1>::ForwardType a1,
typename internal::CallbackParamTraits<A2>::ForwardType a2,
@@ -368,7 +368,7 @@ class CallbackRegistry<void(A1, A2, A3, A4, A5, A6, A7)>
typename internal::CallbackParamTraits<A5>::ForwardType a5,
typename internal::CallbackParamTraits<A6>::ForwardType a6,
typename internal::CallbackParamTraits<A7>::ForwardType a7) {
- typename internal::CallbackRegistryBase<CallbackType>::Iterator it =
+ typename internal::CallbackListBase<CallbackType>::Iterator it =
this->GetIterator();
CallbackType* cb;
while((cb = it.GetNext()) != NULL) {
@@ -377,9 +377,9 @@ class CallbackRegistry<void(A1, A2, A3, A4, A5, A6, A7)>
}
private:
- DISALLOW_COPY_AND_ASSIGN(CallbackRegistry);
+ DISALLOW_COPY_AND_ASSIGN(CallbackList);
};
} // namespace base
-#endif // BASE_CALLBACK_REGISTRY_H
+#endif // BASE_CALLBACK_LIST_H_
« no previous file with comments | « base/base.gypi ('k') | base/callback_list.h.pump » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698