| Index: ash/system/date/date_view.h
|
| ===================================================================
|
| --- ash/system/date/date_view.h (revision 151406)
|
| +++ ash/system/date/date_view.h (working copy)
|
| @@ -67,8 +67,8 @@
|
| virtual bool PerformAction(const ui::Event& event) OVERRIDE;
|
|
|
| // Overridden from views::View.
|
| - virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE;
|
| - virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE;
|
| + virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
|
| + virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
|
|
|
| views::Label* date_label_;
|
| views::Label* day_of_week_label_;
|
| @@ -104,7 +104,7 @@
|
| virtual bool PerformAction(const ui::Event& event) OVERRIDE;
|
|
|
| // Overridden from views::View.
|
| - virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
|
| + virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
|
|
|
| void SetBorder(TrayDate::ClockLayout clock_layout);
|
| void SetupLabels();
|
|
|