diff options
| author | mostynb <mostynb@opera.com> | 2014-10-03 09:23:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-03 16:24:05 +0000 |
| commit | 10d6b38a855066b1400d96d0600c6e2aec42cbf1 (patch) | |
| tree | 8df573d9a31973c64cd9c50e9a2a6a6fa5c49e82 /ash/system/tray/system_tray_bubble.cc | |
| parent | 90b32ca95485409ba5646c96a4ec0aa4b6216aee (diff) | |
| download | chromium_src-10d6b38a855066b1400d96d0600c6e2aec42cbf1.zip chromium_src-10d6b38a855066b1400d96d0600c6e2aec42cbf1.tar.gz chromium_src-10d6b38a855066b1400d96d0600c6e2aec42cbf1.tar.bz2 | |
replace OVERRIDE and FINAL with override and final in ash/
BUG=417463
Review URL: https://codereview.chromium.org/621133002
Cr-Commit-Position: refs/heads/master@{#298040}
Diffstat (limited to 'ash/system/tray/system_tray_bubble.cc')
| -rw-r--r-- | ash/system/tray/system_tray_bubble.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ash/system/tray/system_tray_bubble.cc b/ash/system/tray/system_tray_bubble.cc index cea360b..97500df 100644 --- a/ash/system/tray/system_tray_bubble.cc +++ b/ash/system/tray/system_tray_bubble.cc @@ -66,28 +66,28 @@ class TrayPopupItemContainer : public views::View { private: // Overridden from views::View. - virtual void ChildVisibilityChanged(View* child) OVERRIDE { + virtual void ChildVisibilityChanged(View* child) override { if (visible() == child->visible()) return; SetVisible(child->visible()); PreferredSizeChanged(); } - virtual void ChildPreferredSizeChanged(View* child) OVERRIDE { + virtual void ChildPreferredSizeChanged(View* child) override { PreferredSizeChanged(); } - virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE { + virtual void OnMouseEntered(const ui::MouseEvent& event) override { hover_ = true; SchedulePaint(); } - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE { + virtual void OnMouseExited(const ui::MouseEvent& event) override { hover_ = false; SchedulePaint(); } - virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE { + virtual void OnPaintBackground(gfx::Canvas* canvas) override { if (child_count() == 0) return; @@ -115,7 +115,7 @@ class AnimationObserverDeleteLayer : public ui::ImplicitAnimationObserver { virtual ~AnimationObserverDeleteLayer() { } - virtual void OnImplicitAnimationsCompleted() OVERRIDE { + virtual void OnImplicitAnimationsCompleted() override { base::MessageLoopForUI::current()->DeleteSoon(FROM_HERE, this); } |