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

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

Index: chrome/browser/ui/views/aura/status_area_host_aura.cc
diff --git a/chrome/browser/ui/views/aura/status_area_host_aura.cc b/chrome/browser/ui/views/aura/status_area_host_aura.cc
index 69c647afe687a1556cb9478d5b2843e13867455d..9f6fab7838bdcaf2c7f97b182cb8862197d5338e 100644
--- a/chrome/browser/ui/views/aura/status_area_host_aura.cc
+++ b/chrome/browser/ui/views/aura/status_area_host_aura.cc
@@ -20,6 +20,7 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
+#include "chrome/browser/chromeos/status/timezone_clock_updater.h"
 #endif
 
 StatusAreaHostAura::StatusAreaHostAura()
@@ -27,6 +28,13 @@ StatusAreaHostAura::StatusAreaHostAura()
       status_area_view_(NULL) {
 }
 
+StatusAreaHostAura::~StatusAreaHostAura() {
+}
+
+const views::View* StatusAreaHostAura::GetStatusArea() const {
+  return status_area_view_;
+}
+
 views::Widget* StatusAreaHostAura::CreateStatusArea() {
   aura_shell::Shell* aura_shell = aura_shell::Shell::GetInstance();
   aura::Window* status_window = aura_shell->GetContainer(
@@ -37,8 +45,12 @@ views::Widget* StatusAreaHostAura::CreateStatusArea() {
 
   // Add child buttons.
 #if defined(OS_CHROMEOS)
+  ClockMenuButton* clock = NULL;
   chromeos::StatusAreaViewChromeos::AddChromeosButtons(
-      status_area_view_, this, chromeos::StatusAreaViewChromeos::BROWSER_MODE);
+      status_area_view_, this, chromeos::StatusAreaViewChromeos::BROWSER_MODE,
+      &clock);
+  DCHECK(clock);
+  timezone_clock_updater_.reset(new TimezoneClockUpdater(clock));
 #else
   const bool border = true;
   const bool no_border = false;