diff options
Diffstat (limited to 'base/observer_list.h')
| -rw-r--r-- | base/observer_list.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/base/observer_list.h b/base/observer_list.h index a454430fc9..31564212e0 100644 --- a/base/observer_list.h +++ b/base/observer_list.h @@ -5,13 +5,16 @@ #ifndef BASE_OBSERVER_LIST_H_ #define BASE_OBSERVER_LIST_H_ +#include <stddef.h> + #include <algorithm> #include <limits> #include <vector> -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/weak_ptr.h" +#include "base/stl_util.h" /////////////////////////////////////////////////////////////////////////////// // @@ -157,8 +160,7 @@ ObserverType* ObserverListBase<ObserverType>::Iterator::GetNext() { template <class ObserverType> void ObserverListBase<ObserverType>::AddObserver(ObserverType* obs) { DCHECK(obs); - if (std::find(observers_.begin(), observers_.end(), obs) - != observers_.end()) { + if (ContainsValue(observers_, obs)) { NOTREACHED() << "Observers can only be added once!"; return; } |