Relands: Fixes bug where clock button wasn't updating in response to a

chrome/browser/chromeos/status/status_area_view_chromeos.h

Index: chrome/browser/chromeos/status/status_area_view_chromeos.h
diff --git a/chrome/browser/chromeos/status/status_area_view_chromeos.h b/chrome/browser/chromeos/status/status_area_view_chromeos.h
index df88d4143cb8c6adf1756dcbdcdf9071ce6772d5..82af1a2ae9c7d31f5191870f43a0ab6b80544a76 100644
--- a/chrome/browser/chromeos/status/status_area_view_chromeos.h
+++ b/chrome/browser/chromeos/status/status_area_view_chromeos.h
@@ -12,6 +12,8 @@
 #include "chrome/browser/chromeos/system/timezone_settings.h"
 #include "chrome/browser/chromeos/view_ids.h"
 
+class ClockMenuButton;
+
 namespace chromeos {
 
 class StatusAreaViewChromeos : public StatusAreaView,
@@ -41,9 +43,12 @@ class StatusAreaViewChromeos : public StatusAreaView,
   void SetDefaultUse24HourClock(bool use_24hour_clock);
 
   // Convenience function to add buttons to a status area for ChromeOS.
+  // |clock_button| (if non-NULL) is set to the ClockMenuButton that is created
+  // by this method.
   static void AddChromeosButtons(StatusAreaView* status_area,
                                  StatusAreaButton::Delegate* delegate,
-                                 ScreenMode screen_mode);
+                                 ScreenMode screen_mode,
+                                 ClockMenuButton** clock_button);
 
  private:
   void UpdateClockText();