Chromium Code Reviews| Index: ash/system/date/tray_date.h |
| diff --git a/ash/system/date/tray_date.h b/ash/system/date/tray_date.h |
| index 90c02e2075f6f8746dafd3c2bf86787a85119f7c..2957b1ba18090b605351c3aa2256607e244147d0 100644 |
| --- a/ash/system/date/tray_date.h |
| +++ b/ash/system/date/tray_date.h |
| @@ -27,8 +27,13 @@ class TimeView; |
| class ASH_EXPORT TrayDate : public SystemTrayItem, public ClockObserver { |
| public: |
| enum ClockLayout { |
| - HORIZONTAL_CLOCK, |
| - VERTICAL_CLOCK, |
| + HORIZONTAL_CLOCK, |
| + VERTICAL_CLOCK, |
| + }; |
|
stevenjb
2014/04/25 22:53:31
nit: WS
michaelpg
2014/04/25 23:50:29
Done.
|
| + enum DateAction { |
| + NONE, |
| + SET_SYSTEM_TIME, |
| + SHOW_DATE_SETTINGS, |
| }; |
|
stevenjb
2014/04/25 22:53:31
nit: please add WS
michaelpg
2014/04/25 23:50:29
Done.
|
| explicit TrayDate(SystemTray* system_tray); |
| virtual ~TrayDate(); |
| @@ -55,12 +60,14 @@ class ASH_EXPORT TrayDate : public SystemTrayItem, public ClockObserver { |
| // Overridden from ClockObserver. |
| virtual void OnDateFormatChanged() OVERRIDE; |
| virtual void OnSystemClockTimeUpdated() OVERRIDE; |
| + virtual void OnSystemClockCanSetTimeChanged(bool can_set_time) OVERRIDE; |
| virtual void Refresh() OVERRIDE; |
| void SetupLabelForTimeTray(views::Label* label); |
| tray::TimeView* time_tray_; |
| DateDefaultView* default_view_; |
| + user::LoginStatus login_status_; |
| #if defined(OS_CHROMEOS) |
| scoped_ptr<SystemClockObserver> system_clock_observer_; |