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

chrome/browser/ui/views/aura/status_area_host_aura.h

Index: chrome/browser/ui/views/aura/status_area_host_aura.h
diff --git a/chrome/browser/ui/views/aura/status_area_host_aura.h b/chrome/browser/ui/views/aura/status_area_host_aura.h
index 20700be045d128421a119f27a9ef8ebe20522939..5a456704c2226e3a0799bd347c60872ce2600e2d 100644
--- a/chrome/browser/ui/views/aura/status_area_host_aura.h
+++ b/chrome/browser/ui/views/aura/status_area_host_aura.h
@@ -10,14 +10,20 @@
 #include "chrome/browser/chromeos/status/status_area_button.h"
 
 class StatusAreaView;
+class TimezoneClockUpdater;
 
 namespace views {
+class Views;
 class Widget;
 }
 
 class StatusAreaHostAura : public StatusAreaButton::Delegate {
  public:
   StatusAreaHostAura();
+  virtual ~StatusAreaHostAura();
+
+  // Returns the view housing the status area. Exposed for testing.
+  const views::View* GetStatusArea() const;
 
   // Instantiates and sets |status_area_view_|, and sets it as the contents of
   // a new views::Widget |status_area_widget_| which is returned.
@@ -39,6 +45,10 @@ class StatusAreaHostAura : public StatusAreaButton::Delegate {
   // Owned by status_area_widget_.
   StatusAreaView* status_area_view_;
 
+#if defined(OS_CHROMEOS)
+  scoped_ptr<TimezoneClockUpdater> timezone_clock_updater_;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(StatusAreaHostAura);
 };