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

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

 // 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.
 
 #include "chrome/browser/ui/views/aura/status_area_host_aura.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"
 #include "chrome/browser/chromeos/status/clock_menu_button.h"
 #include "chrome/browser/chromeos/status/memory_menu_button.h"
 #include "chrome/browser/chromeos/status/status_area_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/aura_shell/shell_window_ids.h"
 #include "views/widget/widget.h"
 
 #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()
     : status_area_widget_(NULL),
       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(
       aura_shell::internal::kShellWindowId_StatusContainer);
 
   // Create status area view.
   status_area_view_ = new StatusAreaView();
 
   // 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;
 #if defined(OS_LINUX)
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kMemoryWidget))
     status_area_view_->AddButton(new MemoryMenuButton(this), no_border);
 #endif
   status_area_view_->AddButton(new ClockMenuButton(this), border);
 #endif
 
@@ skipping 50 matching lines @@
 }
 
 StatusAreaButton::TextStyle StatusAreaHostAura::GetStatusAreaTextStyle() const {
   return StatusAreaButton::WHITE_HALOED;
 }
 
 void StatusAreaHostAura::ButtonVisibilityChanged(views::View* button_view) {
   if (status_area_view_)
     status_area_view_->UpdateButtonVisibility();
 }