Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2492)

Unified Diff: ash/system/date/tray_date.h

Issue 247663003: Date and Time dialog for when the clock isn't synced. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Observe system clock Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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_;

Powered by Google App Engine
This is Rietveld 408576698