| Index: base/observer_list.h
|
| diff --git a/base/observer_list.h b/base/observer_list.h
|
| index 7543a98180995fba09e4905e78ad1fab275d8d10..8f0be2d639bafc585efd0932cafbd21e42252850 100644
|
| --- a/base/observer_list.h
|
| +++ b/base/observer_list.h
|
| @@ -92,9 +92,6 @@ class ObserverListBase
|
| explicit Iter(ContainerType* list);
|
| ~Iter();
|
|
|
| - // Deprecated.
|
| - ObserverType* GetNext();
|
| -
|
| // A workaround for C2244. MSVC requires fully qualified type name for
|
| // return type on a function definition to match a function declaration.
|
| using ThisType =
|
| @@ -273,15 +270,6 @@ void ObserverListBase<ObserverType>::Iter<ContainerType>::EnsureValidIndex() {
|
| }
|
|
|
| template <class ObserverType>
|
| -template <class ContainerType>
|
| -ObserverType* ObserverListBase<ObserverType>::Iter<ContainerType>::GetNext() {
|
| - EnsureValidIndex();
|
| - ObserverType* current = GetCurrent();
|
| - operator++();
|
| - return current;
|
| -}
|
| -
|
| -template <class ObserverType>
|
| void ObserverListBase<ObserverType>::AddObserver(ObserverType* obs) {
|
| DCHECK(obs);
|
| if (ContainsValue(observers_, obs)) {
|
|
|