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

chrome/browser/chromeos/system/ash_system_tray_delegate.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 "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
 
 #include "ash/shell.h"
 #include "ash/system/audio/audio_controller.h"
 #include "ash/system/brightness/brightness_controller.h"
 #include "ash/system/network/network_controller.h"
+#include "ash/system/power/date_format_observer.h"
 #include "ash/system/power/power_status_controller.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/user/update_controller.h"
 #include "base/logging.h"
 #include "chrome/browser/chromeos/audio/audio_handler.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/status/network_menu_icon.h"
+#include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/upgrade_detector.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_service.h"
 
 namespace chromeos {
 
 namespace {
 
 class SystemTrayDelegate : public ash::SystemTrayDelegate,
                            public AudioHandler::VolumeObserver,
@@ skipping 17 matching lines @@
     crosnet->AddNetworkManagerObserver(this);
     OnNetworkManagerChanged(crosnet);
     crosnet->AddCellularDataPlanObserver(this);
 
     registrar_.Add(this,
                    chrome::NOTIFICATION_LOGIN_USER_CHANGED,
                    content::NotificationService::AllSources());
     registrar_.Add(this,
                    chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
                    content::NotificationService::AllSources());
+
+    InitializePrefChangeRegistrar();
   }
 
   virtual ~SystemTrayDelegate() {
     AudioHandler* audiohandler = AudioHandler::GetInstance();
     if (audiohandler)
       audiohandler->RemoveVolumeObserver(this);
     DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
   }
 
   // Overridden from ash::SystemTrayDelegate:
@@ skipping 22 matching lines @@
 
   virtual bool SystemShouldUpgrade() const OVERRIDE {
     return UpgradeDetector::GetInstance()->notify_upgrade();
   }
 
   virtual int GetSystemUpdateIconResource() const OVERRIDE {
     return UpgradeDetector::GetInstance()->GetIconResourceID(
         UpgradeDetector::UPGRADE_ICON_TYPE_MENU_ICON);
   }
 
+  virtual base::HourClockType GetHourClockType() const OVERRIDE {
+    Profile* profile = ProfileManager::GetDefaultProfile();
+    return !profile || profile->GetPrefs()->GetBoolean(prefs::kUse24HourClock) ?
+        base::k24HourClock : base::k12HourClock;
+  }
+
   virtual void ShowSettings() OVERRIDE {
     BrowserList::GetLastActive()->OpenOptionsDialog();
   }
 
   virtual void ShowDateSettings() OVERRIDE {
     BrowserList::GetLastActive()->OpenAdvancedOptionsDialog();
   }
 
   virtual void ShowHelp() OVERRIDE {
     BrowserList::GetLastActive()->ShowHelpTab();
@@ skipping 28 matching lines @@
         NotifyScreenLockRequested();
   }
 
   virtual ash::NetworkIconInfo GetMostRelevantNetworkIcon() OVERRIDE {
     ash::NetworkIconInfo info;
     info.image = network_icon_->GetIconAndText(&info.description);
     return info;
   }
 
  private:
+  void InitializePrefChangeRegistrar() {
+    Profile* profile = ProfileManager::GetDefaultProfile();
+    pref_registrar_.reset(new PrefChangeRegistrar);
+    pref_registrar_->Init(profile->GetPrefs());
+    pref_registrar_->Add(prefs::kUse24HourClock, this);
+  }
+
   void NotifyRefreshNetwork() {
     ash::NetworkController* controller =
         ash::Shell::GetInstance()->network_controller();
     if (controller) {
       ash::NetworkIconInfo info;
       info.image = network_icon_->GetIconAndText(&info.description);
       controller->OnNetworkRefresh(info);
     }
   }
 
@@ skipping 72 matching lines @@
   virtual void OnCellularDataPlanChanged(NetworkLibrary* crosnet) OVERRIDE {
     NotifyRefreshNetwork();
   }
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE {
     switch (type) {
       case chrome::NOTIFICATION_LOGIN_USER_CHANGED: {
+        // Profile may have changed after login. So re-initialize the
+        // pref-change registrar.
+        InitializePrefChangeRegistrar();
         tray_->UpdateAfterLoginStatusChange(GetUserLoginStatus());
         break;
       }
       case chrome::NOTIFICATION_UPGRADE_RECOMMENDED: {
         ash::UpdateController* controller =
             ash::Shell::GetInstance()->update_controller();
         if (controller)
           controller->OnUpdateRecommended();
         break;
       }
+      case chrome::NOTIFICATION_PREF_CHANGED: {
+        DCHECK_EQ(*content::Details<std::string>(details).ptr(),
+                  prefs::kUse24HourClock);
+        ash::DateFormatObserver* observer =
+            ash::Shell::GetInstance()->date_format_observer();
+        if (observer)
+          observer->OnDateFormatChanged();
+        break;
+      }
       default:
         NOTREACHED();
     }
   }
 
   ash::SystemTray* tray_;
   scoped_ptr<NetworkMenuIcon> network_icon_;
   content::NotificationRegistrar registrar_;
+  scoped_ptr<PrefChangeRegistrar> pref_registrar_;
   std::string cellular_device_path_;
   std::string active_network_path_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {
   return new chromeos::SystemTrayDelegate(tray);
 }
 
 }  // namespace chromeos