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

Unified Diff: ash/shell.cc

Issue 9702024: ash: Take the 24h clock pref into consideration when showing the time. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 9 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
« no previous file with comments | « ash/shell.h ('k') | ash/system/power/date_format_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « ash/shell.h ('k') | ash/system/power/date_format_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698