| Index: ash/system/date/date_view.h
|
| diff --git a/ash/system/date/date_view.h b/ash/system/date/date_view.h
|
| index 301fa093a0b7789df30e2e81d740bef5bf46da57..05d042c0d4415e895b4a33530b27f605cb08eeba 100644
|
| --- a/ash/system/date/date_view.h
|
| +++ b/ash/system/date/date_view.h
|
| @@ -24,7 +24,7 @@ namespace tray {
|
| // DateView popup and the TimeView tray icon. Exported for tests.
|
| class ASH_EXPORT BaseDateTimeView : public ActionableView {
|
| public:
|
| - virtual ~BaseDateTimeView();
|
| + ~BaseDateTimeView() override;
|
|
|
| // Updates the displayed text for the current time and calls SetTimer().
|
| void UpdateText();
|
| @@ -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;
|
| + void ChildPreferredSizeChanged(views::View* child) override;
|
| + void OnLocaleChanged() override;
|
|
|
| // Invokes UpdateText() when the displayed time should change.
|
| base::OneShotTimer<BaseDateTimeView> timer_;
|
| @@ -53,7 +53,7 @@ class ASH_EXPORT BaseDateTimeView : public ActionableView {
|
| class ASH_EXPORT DateView : public BaseDateTimeView {
|
| public:
|
| DateView();
|
| - virtual ~DateView();
|
| + ~DateView() override;
|
|
|
| // Sets the action the view should take. An actionable date view gives visual
|
| // feedback on hover, can be focused by keyboard, and clicking/pressing space
|
| @@ -70,15 +70,15 @@ class ASH_EXPORT DateView : public BaseDateTimeView {
|
| void SetActive(bool active);
|
|
|
| // Overridden from BaseDateTimeView.
|
| - virtual void UpdateTextInternal(const base::Time& now) override;
|
| + void UpdateTextInternal(const base::Time& now) override;
|
|
|
| // Overridden from ActionableView.
|
| - virtual bool PerformAction(const ui::Event& event) override;
|
| + 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 OnGestureEvent(ui::GestureEvent* event) override;
|
| + void OnMouseEntered(const ui::MouseEvent& event) override;
|
| + void OnMouseExited(const ui::MouseEvent& event) override;
|
| + void OnGestureEvent(ui::GestureEvent* event) override;
|
|
|
| views::Label* date_label_;
|
|
|
| @@ -95,7 +95,7 @@ class ASH_EXPORT DateView : public BaseDateTimeView {
|
| class ASH_EXPORT TimeView : public BaseDateTimeView {
|
| public:
|
| explicit TimeView(TrayDate::ClockLayout clock_layout);
|
| - virtual ~TimeView();
|
| + ~TimeView() override;
|
|
|
| // Updates the format of the displayed time.
|
| void UpdateTimeFormat();
|
| @@ -109,13 +109,13 @@ class ASH_EXPORT TimeView : public BaseDateTimeView {
|
| friend class TimeViewTest;
|
|
|
| // Overridden from BaseDateTimeView.
|
| - virtual void UpdateTextInternal(const base::Time& now) override;
|
| + void UpdateTextInternal(const base::Time& now) override;
|
|
|
| // Overridden from ActionableView.
|
| - virtual bool PerformAction(const ui::Event& event) override;
|
| + bool PerformAction(const ui::Event& event) override;
|
|
|
| // Overridden from views::View.
|
| - virtual bool OnMousePressed(const ui::MouseEvent& event) override;
|
| + bool OnMousePressed(const ui::MouseEvent& event) override;
|
|
|
| void SetBorderFromLayout(TrayDate::ClockLayout clock_layout);
|
| void SetupLabels();
|
|
|