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

Unified Diff: ash/system/date/date_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/date/date_default_view.h ('k') | ash/system/date/tray_date.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/date/date_view.h
diff --git a/ash/system/date/date_view.h b/ash/system/date/date_view.h
index 1f4377abaf5d1ba5828df45d29f458784e230922..bfec10cdafd49c8b57e4b5fcad29d36139497820 100644
--- a/ash/system/date/date_view.h
+++ b/ash/system/date/date_view.h
@@ -40,8 +40,8 @@ class ASH_EXPORT BaseDateTimeView : public ActionableView {
virtual void UpdateTextInternal(const base::Time& now) = 0;
// Overridden from views::View.
- virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE;
- virtual void OnLocaleChanged() OVERRIDE;
+ virtual void ChildPreferredSizeChanged(views::View* child) override;
+ virtual void OnLocaleChanged() override;
// Invokes UpdateText() when the displayed time should change.
base::OneShotTimer<BaseDateTimeView> timer_;
@@ -67,14 +67,14 @@ class ASH_EXPORT DateView : public BaseDateTimeView {
private:
// Overridden from BaseDateTimeView.
- virtual void UpdateTextInternal(const base::Time& now) OVERRIDE;
+ virtual void UpdateTextInternal(const base::Time& now) override;
// Overridden from ActionableView.
- virtual bool PerformAction(const ui::Event& event) OVERRIDE;
+ virtual bool PerformAction(const ui::Event& event) override;
// Overridden from views::View.
- virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
- virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
+ virtual void OnMouseEntered(const ui::MouseEvent& event) override;
+ virtual void OnMouseExited(const ui::MouseEvent& event) override;
views::Label* date_label_;
@@ -105,13 +105,13 @@ class ASH_EXPORT TimeView : public BaseDateTimeView {
friend class TimeViewTest;
// Overridden from BaseDateTimeView.
- virtual void UpdateTextInternal(const base::Time& now) OVERRIDE;
+ virtual void UpdateTextInternal(const base::Time& now) override;
// Overridden from ActionableView.
- virtual bool PerformAction(const ui::Event& event) OVERRIDE;
+ virtual bool PerformAction(const ui::Event& event) override;
// Overridden from views::View.
- virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
+ virtual bool OnMousePressed(const ui::MouseEvent& event) override;
void SetBorderFromLayout(TrayDate::ClockLayout clock_layout);
void SetupLabels();
« no previous file with comments | « ash/system/date/date_default_view.h ('k') | ash/system/date/tray_date.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698