| Index: ui/compositor/layer_animation_sequence.cc
|
| diff --git a/ui/compositor/layer_animation_sequence.cc b/ui/compositor/layer_animation_sequence.cc
|
| index 041bdbeea8e65b6e16023b1232bee98c5efd6dee..0d776ca79daf88221a02a57966a552320140c22e 100644
|
| --- a/ui/compositor/layer_animation_sequence.cc
|
| +++ b/ui/compositor/layer_animation_sequence.cc
|
| @@ -38,9 +38,8 @@ LayerAnimationSequence::LayerAnimationSequence(LayerAnimationElement* element)
|
| }
|
|
|
| LayerAnimationSequence::~LayerAnimationSequence() {
|
| - FOR_EACH_OBSERVER(LayerAnimationObserver,
|
| - observers_,
|
| - DetachedFromSequence(this, true));
|
| + for (auto& observer : observers_)
|
| + observer.DetachedFromSequence(this, true);
|
| }
|
|
|
| void LayerAnimationSequence::Start(LayerAnimationDelegate* delegate) {
|
| @@ -258,26 +257,23 @@ LayerAnimationElement* LayerAnimationSequence::FirstElement() const {
|
| }
|
|
|
| void LayerAnimationSequence::NotifyScheduled() {
|
| - FOR_EACH_OBSERVER(LayerAnimationObserver,
|
| - observers_,
|
| - OnLayerAnimationScheduled(this));
|
| + for (auto& observer : observers_)
|
| + observer.OnLayerAnimationScheduled(this);
|
| }
|
|
|
| void LayerAnimationSequence::NotifyStarted() {
|
| - FOR_EACH_OBSERVER(LayerAnimationObserver, observers_,
|
| - OnLayerAnimationStarted(this));
|
| + for (auto& observer : observers_)
|
| + observer.OnLayerAnimationStarted(this);
|
| }
|
|
|
| void LayerAnimationSequence::NotifyEnded() {
|
| - FOR_EACH_OBSERVER(LayerAnimationObserver,
|
| - observers_,
|
| - OnLayerAnimationEnded(this));
|
| + for (auto& observer : observers_)
|
| + observer.OnLayerAnimationEnded(this);
|
| }
|
|
|
| void LayerAnimationSequence::NotifyAborted() {
|
| - FOR_EACH_OBSERVER(LayerAnimationObserver,
|
| - observers_,
|
| - OnLayerAnimationAborted(this));
|
| + for (auto& observer : observers_)
|
| + observer.OnLayerAnimationAborted(this);
|
| }
|
|
|
| LayerAnimationElement* LayerAnimationSequence::CurrentElement() const {
|
|
|