Chromium Code Reviews| Index: ash/first_run/desktop_cleaner.cc |
| diff --git a/ash/first_run/desktop_cleaner.cc b/ash/first_run/desktop_cleaner.cc |
| index 6f0dfb114adbb38a1c759f35ec371786d90ed066..eb0916b8d0f9d98cc4405145ba66b4bdc3f7b32d 100644 |
| --- a/ash/first_run/desktop_cleaner.cc |
| +++ b/ash/first_run/desktop_cleaner.cc |
| @@ -41,7 +41,7 @@ class ContainerHider : public aura::WindowObserver, |
| layer->SetOpacity(0.0); |
| } |
| - virtual ~ContainerHider() { |
| + ~ContainerHider() override { |
| if (container_was_hidden_ || !container_) |
| return; |
| if (!WasAnimationCompletedForProperty(ui::LayerAnimationElement::OPACITY)) { |
| @@ -57,12 +57,10 @@ class ContainerHider : public aura::WindowObserver, |
| private: |
| // Overriden from ui::ImplicitAnimationObserver. |
| - virtual void OnImplicitAnimationsCompleted() override { |
| - container_->Hide(); |
| - } |
| + void OnImplicitAnimationsCompleted() override { container_->Hide(); } |
| // Overriden from aura::WindowObserver. |
| - virtual void OnWindowDestroying(aura::Window* window) override { |
| + void OnWindowDestroying(aura::Window* window) override { |
| DCHECK(window == container_); |
| container_ = NULL; |
| } |
| @@ -81,11 +79,11 @@ class NotificationBlocker : public message_center::NotificationBlocker { |
| NotifyBlockingStateChanged(); |
| } |
| - virtual ~NotificationBlocker() {}; |
| + ~NotificationBlocker() override{}; |
|
Daniel Erat
2014/10/27 21:55:49
i feel like the following, with a space between 'o
dcheng
2014/10/27 22:03:41
I think this is a misformatting by clang-format. T
|
| private: |
| // Overriden from message_center::NotificationBlocker. |
| - virtual bool ShouldShowNotificationAsPopup( |
| + bool ShouldShowNotificationAsPopup( |
| const message_center::NotifierId& notifier_id) const override { |
| return false; |
| } |