| 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..c84e86ebad47baede33486c262a004567400d152 100644
|
| --- a/ash/system/date/tray_date.h
|
| +++ b/ash/system/date/tray_date.h
|
| @@ -27,9 +27,16 @@ class TimeView;
|
| class ASH_EXPORT TrayDate : public SystemTrayItem, public ClockObserver {
|
| public:
|
| enum ClockLayout {
|
| - HORIZONTAL_CLOCK,
|
| - VERTICAL_CLOCK,
|
| + HORIZONTAL_CLOCK,
|
| + VERTICAL_CLOCK,
|
| };
|
| +
|
| + enum DateAction {
|
| + NONE,
|
| + SET_SYSTEM_TIME,
|
| + SHOW_DATE_SETTINGS,
|
| + };
|
| +
|
| explicit TrayDate(SystemTray* system_tray);
|
| virtual ~TrayDate();
|
|
|
| @@ -55,12 +62,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_;
|
|
|