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(); |