ash: Take the 24h clock pref into consideration when showing the time.

ash/system/power/tray_power_date.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/power/tray_power_date.h"
 
 #include "ash/shell.h"
 #include "ash/system/power/power_supply_status.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 61 matching lines @@
 namespace tray {
 
 // This view is used for both the tray and the popup.
 class DateView : public views::View {
  public:
   enum TimeType {
     TIME,
     DATE
   };
 
-  DateView(base::HourClockType hour_type, TimeType type)
-      : hour_type_(hour_type),
+  explicit DateView(TimeType type)
+      : hour_type_(ash::Shell::GetInstance()->tray_delegate()->
+            GetHourClockType()),
         type_(type),
         actionable_(false) {
     SetLayoutManager(new views::FillLayout());
     label_ = new views::Label;
     UpdateText();
     AddChildView(label_);
   }
 
   virtual ~DateView() {
     timer_.Stop();
   }
 
+  void UpdateTimeFormat() {
+    hour_type_ = ash::Shell::GetInstance()->tray_delegate()->GetHourClockType();
+    UpdateText();
+  }
+
   views::Label* label() const { return label_; }
 
   void set_actionable(bool actionable) { actionable_ = actionable; }
 
  private:
   void UpdateText() {
     base::Time now = base::Time::Now();
-    if (type_ == TIME) {
+    if (type_ == DATE) {
+      label_->SetText(FormatNicely(now));
+    } else {
       label_->SetText(base::TimeFormatTimeOfDayWithHourClockType(
           now, hour_type_, base::kDropAmPm));
-    } else {
-      label_->SetText(FormatNicely(now));
     }
 
     label_->SetTooltipText(base::TimeFormatFriendlyDate(now));
     SchedulePaint();
 
     // Try to set the timer to go off at the next change of the minute. We don't
     // want to have the timer go off more than necessary since that will cause
     // the CPU to wake up and consume power.
     base::Time::Exploded exploded;
     now.LocalExplode(&exploded);
 
     // Often this will be called at minute boundaries, and we'll actually want
     // 60 seconds from now.
     int seconds_left = 60 - exploded.second;
     if (seconds_left == 0)
       seconds_left = 60;
 
     // Make sure that the timer fires on the next minute. Without this, if it is
     // called just a teeny bit early, then it will skip the next minute.
     seconds_left += kTimerSlopSeconds;
 
+    timer_.Stop();
     timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(seconds_left), this,
         &DateView::UpdateText);
   }
 
   // Overridden from views::View.
   virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE {
     if (!actionable_)
       return false;
 
     ash::Shell::GetInstance()->tray_delegate()->ShowDateSettings();
@@ skipping 126 matching lines @@
 
 TrayPowerDate::TrayPowerDate()
     : power_(NULL),
       power_tray_(NULL) {
 }
 
 TrayPowerDate::~TrayPowerDate() {
 }
 
 views::View* TrayPowerDate::CreateTrayView(user::LoginStatus status) {
-  date_tray_.reset(new tray::DateView(base::k24HourClock,
-                                      tray::DateView::TIME));
+  date_tray_.reset(new tray::DateView(tray::DateView::TIME));
   date_tray_->label()->SetFont(
       date_tray_->label()->font().DeriveFont(-1, gfx::Font::BOLD));
   date_tray_->label()->SetAutoColorReadabilityEnabled(false);
   date_tray_->label()->SetEnabledColor(SK_ColorWHITE);
 
   power_tray_.reset(new tray::PowerTrayView());
 
   views::View* container = new views::View;
   container->SetLayoutManager(new views::BoxLayout(
         views::BoxLayout::kHorizontal, 0, 0, 0));
   container->AddChildView(power_tray_.get());
   container->AddChildView(date_tray_.get());
 
   return container;
 }
 
 views::View* TrayPowerDate::CreateDefaultView(user::LoginStatus status) {
-  date_.reset(new tray::DateView(base::k24HourClock,
-                                 tray::DateView::DATE));
+  date_.reset(new tray::DateView(tray::DateView::DATE));
   if (status != user::LOGGED_IN_NONE)
     date_->set_actionable(true);
 
   power_.reset(new tray::PowerPopupView());
 
   views::View* container = new views::View;
   views::BoxLayout* layout = new
       views::BoxLayout(views::BoxLayout::kHorizontal, 0, 10, 0);
   layout->set_spread_blank_space(true);
   container->SetLayoutManager(layout);
@@ skipping 20 matching lines @@
 
 void TrayPowerDate::DestroyDetailedView() {
 }
 
 void TrayPowerDate::OnPowerStatusChanged(const PowerSupplyStatus& status) {
   power_tray_->UpdatePowerStatus(status);
   if (power_.get())
     power_->UpdatePowerStatus(status);
 }
 
+void TrayPowerDate::OnDateFormatChanged() {
+  date_tray_->UpdateTimeFormat();
+}
+
 }  // namespace internal
 }  // namespace ash