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

ash/shell.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/shell.h"
 
 #include <algorithm>
 
 #include "ash/app_list/app_list.h"
 #include "ash/ash_switches.h"
@@ skipping 230 matching lines @@
   }
 
   virtual bool SystemShouldUpgrade() const OVERRIDE {
     return true;
   }
 
   virtual int GetSystemUpdateIconResource() const OVERRIDE {
     return IDR_AURA_UBER_TRAY_UPDATE;
   }
 
+  virtual base::HourClockType GetHourClockType() const OVERRIDE {
+    return base::k24HourClock;
+  }
+
   virtual void ShowSettings() OVERRIDE {
   }
 
   virtual void ShowDateSettings() OVERRIDE {
   }
 
   virtual void ShowHelp() OVERRIDE {
   }
 
   virtual bool IsAudioMuted() const OVERRIDE {
@@ skipping 53 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, public:
 
 Shell::Shell(ShellDelegate* delegate)
     : root_window_(new aura::RootWindow),
       screen_(new ScreenAsh(root_window_.get())),
       root_filter_(NULL),
       delegate_(delegate),
       audio_controller_(NULL),
       brightness_controller_(NULL),
+      date_format_observer_(NULL),
       network_controller_(NULL),
       power_status_controller_(NULL),
       update_controller_(NULL),
       shelf_(NULL),
       desktop_background_mode_(BACKGROUND_IMAGE),
       root_window_layout_(NULL),
       status_widget_(NULL) {
   gfx::Screen::SetInstance(screen_);
 }
 
@@ skipping 138 matching lines @@
     if (!tray_delegate_.get())
       tray_delegate_.reset(new DummySystemTrayDelegate());
 
     internal::TrayVolume* tray_volume = new internal::TrayVolume();
     internal::TrayBrightness* tray_brightness = new internal::TrayBrightness();
     internal::TrayPowerDate* tray_power_date = new internal::TrayPowerDate();
     internal::TrayNetwork* tray_network = new internal::TrayNetwork;
     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;
 
     tray_->AddTrayItem(tray_user);
     tray_->AddTrayItem(new internal::TrayEmpty());
     tray_->AddTrayItem(tray_power_date);
     tray_->AddTrayItem(tray_network);
     tray_->AddTrayItem(tray_volume);
     tray_->AddTrayItem(tray_brightness);
@@ skipping 167 matching lines @@
   // Create the desktop background image.
   SetDesktopBackgroundMode(BACKGROUND_IMAGE);
 }
 
 void Shell::DisableWorkspaceGridLayout() {
   if (workspace_controller_.get())
     workspace_controller_->workspace_manager()->set_grid_size(0);
 }
 
 }  // namespace ash