Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1486)

Unified Diff: ash/system/tray/tray_item_view.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/tray/tray_item_more.h ('k') | ash/system/tray/tray_notification_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/tray_item_view.h
diff --git a/ash/system/tray/tray_item_view.h b/ash/system/tray/tray_item_view.h
index 37e239f0aa740f6adc31dadc8e662e2ea8285daf..421c6520e3c3e31a94d4dec2c5606cd129407506 100644
--- a/ash/system/tray/tray_item_view.h
+++ b/ash/system/tray/tray_item_view.h
@@ -41,9 +41,9 @@ class ASH_EXPORT TrayItemView : public views::View,
views::ImageView* image_view() const { return image_view_; }
// Overridden from views::View.
- virtual void SetVisible(bool visible) OVERRIDE;
- virtual gfx::Size GetPreferredSize() const OVERRIDE;
- virtual int GetHeightForWidth(int width) const OVERRIDE;
+ virtual void SetVisible(bool visible) override;
+ virtual gfx::Size GetPreferredSize() const override;
+ virtual int GetHeightForWidth(int width) const override;
protected:
// Makes sure the widget relayouts after the size/visibility of the view
@@ -61,12 +61,12 @@ class ASH_EXPORT TrayItemView : public views::View,
private:
// Overridden from views::View.
- virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
+ virtual void ChildPreferredSizeChanged(View* child) override;
// Overridden from gfx::AnimationDelegate.
- virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
- virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
- virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE;
+ virtual void AnimationProgressed(const gfx::Animation* animation) override;
+ virtual void AnimationEnded(const gfx::Animation* animation) override;
+ virtual void AnimationCanceled(const gfx::Animation* animation) override;
SystemTrayItem* owner_;
scoped_ptr<gfx::SlideAnimation> animation_;
« no previous file with comments | « ash/system/tray/tray_item_more.h ('k') | ash/system/tray/tray_notification_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698