Chromium Code Reviews| Index: ui/views/animation/ink_drop_animation.cc |
| diff --git a/ui/views/animation/ink_drop_animation.cc b/ui/views/animation/ink_drop_animation.cc |
| index a7a65a6c127fb4e9189b8555bf48acf302127dab..111e910fa56abb98d16dcb883fe1e7601e43a932 100644 |
| --- a/ui/views/animation/ink_drop_animation.cc |
| +++ b/ui/views/animation/ink_drop_animation.cc |
| @@ -7,30 +7,21 @@ |
| namespace views { |
| const float InkDropAnimation::kHiddenOpacity = 0.f; |
| -const float InkDropAnimation::kVisibleOpacity = 0.11f; |
| +const float InkDropAnimation::kVisibleOpacity = 0.175f; |
| -InkDropAnimation::InkDropAnimation() {} |
| +InkDropAnimation::InkDropAnimation() : observer_(nullptr) {} |
| InkDropAnimation::~InkDropAnimation() {} |
| -void InkDropAnimation::AddObserver(InkDropAnimationObserver* observer) { |
| - observers_.AddObserver(observer); |
| -} |
| - |
| -void InkDropAnimation::RemoveObserver(InkDropAnimationObserver* observer) { |
| - observers_.RemoveObserver(observer); |
| -} |
| - |
| void InkDropAnimation::NotifyAnimationStarted(InkDropState ink_drop_state) { |
| - FOR_EACH_OBSERVER(InkDropAnimationObserver, observers_, |
| - InkDropAnimationStarted(ink_drop_state)); |
| + observer_->InkDropAnimationStarted(ink_drop_state); |
|
bruthig
2016/02/23 22:48:09
Why not guard this with "if (observer_)" ?
Similar
Evan Stade
2016/02/24 00:31:57
Because I decided it was an error to not set the o
bruthig
2016/02/24 15:46:55
Acknowledged.
|
| } |
| void InkDropAnimation::NotifyAnimationEnded( |
| InkDropState ink_drop_state, |
| InkDropAnimationObserver::InkDropAnimationEndedReason reason) { |
| - FOR_EACH_OBSERVER(InkDropAnimationObserver, observers_, |
| - InkDropAnimationEnded(ink_drop_state, reason)); |
| + observer_->InkDropAnimationEnded(ink_drop_state, reason); |
| + // |this| may be deleted! |
| } |
| } // namespace views |