diff options
Diffstat (limited to 'chromium/ui/gfx/animation')
| -rw-r--r-- | chromium/ui/gfx/animation/animation.cc | 3 | ||||
| -rw-r--r-- | chromium/ui/gfx/animation/animation_delegate_notifier.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/chromium/ui/gfx/animation/animation.cc b/chromium/ui/gfx/animation/animation.cc index b216afb5cf2..0b1d4f22cc5 100644 --- a/chromium/ui/gfx/animation/animation.cc +++ b/chromium/ui/gfx/animation/animation.cc @@ -26,8 +26,7 @@ base::Optional<bool> Animation::prefers_reduced_motion_; Animation::Animation(base::TimeDelta timer_interval) : timer_interval_(timer_interval), is_animating_(false), - delegate_(NULL) { -} + delegate_(nullptr) {} Animation::~Animation() { // Don't send out notification from the destructor. Chances are the delegate diff --git a/chromium/ui/gfx/animation/animation_delegate_notifier.h b/chromium/ui/gfx/animation/animation_delegate_notifier.h index 6121c7c8d58..7983a70fc39 100644 --- a/chromium/ui/gfx/animation/animation_delegate_notifier.h +++ b/chromium/ui/gfx/animation/animation_delegate_notifier.h @@ -5,7 +5,7 @@ #ifndef UI_GFX_ANIMATION_ANIMATION_DELEGATE_NOTIFIER_H_ #define UI_GFX_ANIMATION_ANIMATION_DELEGATE_NOTIFIER_H_ -#include "base/logging.h" +#include "base/check.h" #include "ui/gfx/animation/animation_delegate.h" namespace gfx { |