Index: ash/shell.cc |
diff --git a/ash/shell.cc b/ash/shell.cc |
index acdce03bbab5069cc797749ea0b54a27142b3250..058abea5f736ff6010a73712d984e4faa5e45dc8 100644 |
--- a/ash/shell.cc |
+++ b/ash/shell.cc |
@@ -248,6 +248,10 @@ class DummySystemTrayDelegate : public SystemTrayDelegate { |
return IDR_AURA_UBER_TRAY_UPDATE; |
} |
+ virtual base::HourClockType GetHourClockType() const OVERRIDE { |
+ return base::k24HourClock; |
+ } |
+ |
virtual void ShowSettings() OVERRIDE { |
} |
@@ -321,6 +325,7 @@ Shell::Shell(ShellDelegate* delegate) |
delegate_(delegate), |
audio_controller_(NULL), |
brightness_controller_(NULL), |
+ date_format_observer_(NULL), |
network_controller_(NULL), |
power_status_controller_(NULL), |
update_controller_(NULL), |
@@ -479,6 +484,7 @@ void Shell::Init() { |
internal::TrayUser* tray_user = new internal::TrayUser; |
audio_controller_ = tray_volume; |
brightness_controller_ = tray_brightness; |
+ date_format_observer_ = tray_power_date; |
network_controller_ = tray_network; |
power_status_controller_ = tray_power_date; |
update_controller_ = tray_user; |