Fix up status area clock code.

chrome/browser/chromeos/status/clock_menu_button.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_CLOCK_MENU_BUTTON_H_
 #define CHROME_BROWSER_CHROMEOS_STATUS_CLOCK_MENU_BUTTON_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 15 matching lines @@
 // The clock menu button in the status area.
 // This button shows the current time.
 class ClockMenuButton : public StatusAreaButton,
                         public views::MenuDelegate,
                         public views::ViewMenuDelegate,
                         public content::NotificationObserver {
  public:
   explicit ClockMenuButton(StatusAreaButton::Delegate* delegate);
   virtual ~ClockMenuButton();
 
+  // content::NotificationObserver implementation.
+  virtual void Observe(int type,
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details) OVERRIDE;
+
   // views::MenuDelegate implementation
   virtual string16 GetLabel(int id) const OVERRIDE;
   virtual bool IsCommandEnabled(int id) const OVERRIDE;
   virtual void ExecuteCommand(int id) OVERRIDE;
 
-  // views::View
-  virtual void OnLocaleChanged() OVERRIDE;
+  // Initialize PrefChangeRegistrar with the current default profile.
+  void UpdateProfile();
 
   // Updates the time on the menu button.
   void UpdateText();
 
-  // Sets default use 24hour clock mode.
-  void SetDefaultUse24HourClock(bool use_24hour_clock);
-
-  // content::NotificationObserver implementation.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
-
  protected:
+  // StatusAreaButton implementation
+  virtual void SetMenuActive(bool active) OVERRIDE;
   virtual int horizontal_padding() OVERRIDE;
 
- private:
+  // views::View implementation
+  virtual void OnLocaleChanged() OVERRIDE;
+
   // views::ViewMenuDelegate implementation.
   virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE;
 
+ private:
+  // Sets default use 24hour clock mode.
+  void SetUse24HourClock(bool use_24hour_clock);
+
   // Create and initialize menu if not already present.
   void EnsureMenu();
 
   // Updates text and schedules the timer to fire at the next minute interval.
   void UpdateTextAndSetNextTimer();
 
   base::OneShotTimer<ClockMenuButton> timer_;
 
   // The clock menu.
   scoped_ptr<views::MenuRunner> menu_runner_;
 
-  PrefChangeRegistrar registrar_;
+  PrefService* pref_service_;
+  scoped_ptr<PrefChangeRegistrar> registrar_;
 
-  // Default value for use_24hour_clock.
-  bool default_use_24hour_clock_;
+  // Cached value for use_24hour_clock.
+  bool use_24hour_clock_;
 
   DISALLOW_COPY_AND_ASSIGN(ClockMenuButton);
 };
 
 #endif  // CHROME_BROWSER_CHROMEOS_STATUS_CLOCK_MENU_BUTTON_H_