Reverting this as it breaks (at least) the Windows Aura build.

Revert 110804 - Fixes bug where clock button wasn't updating in response to a timezone
change.

BUG=104667
TEST=none
R=stevenjb@chromium.org


Review URL: http://codereview.chromium.org/8600001

TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/8500005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110806 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/status/clock_menu_button_browsertest.cc

@@ -17,10 +17,6 @@
 #include "unicode/calendar.h"
 #include "unicode/timezone.h"
 
-#if defined(USE_AURA)
-#include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"
-#endif
-
 namespace chromeos {
 
 class ClockMenuButtonTest : public InProcessBrowserTest {
@@ -31,20 +27,15 @@ class ClockMenuButtonTest : public InProcessBrowserTest {
     // to use stub, so reset it here.
     CrosLibrary::Get()->GetTestApi()->ResetUseStubImpl();
   }
-  const ClockMenuButton* GetClockMenuButton() {
-    const views::View* parent = NULL;
-#if defined(USE_AURA)
-    parent = ChromeShellDelegate::instance()->GetStatusArea();
-#else
-    parent = static_cast<const BrowserView*>(browser()->window());
-#endif
-    return static_cast<const ClockMenuButton*>(parent->GetViewByID(
+  ClockMenuButton* GetClockMenuButton() {
+    BrowserView* view = static_cast<BrowserView*>(browser()->window());
+    return static_cast<ClockMenuButton*>(view->GetViewByID(
         VIEW_ID_STATUS_BUTTON_CLOCK));
   }
 };
 
 IN_PROC_BROWSER_TEST_F(ClockMenuButtonTest, TimezoneTest) {
-  const ClockMenuButton* clock = GetClockMenuButton();
+  ClockMenuButton* clock = GetClockMenuButton();
   ASSERT_TRUE(clock != NULL);
 
   // Update timezone and make sure clock text changes.

chrome/browser/chromeos/status/status_area_view_chromeos.cc

@@ -30,7 +30,7 @@ StatusAreaViewChromeos::~StatusAreaViewChromeos() {
 
 void StatusAreaViewChromeos::Init(StatusAreaButton::Delegate* delegate,
                                   ScreenMode screen_mode) {
-  AddChromeosButtons(this, delegate, screen_mode, NULL);
+  AddChromeosButtons(this, delegate, screen_mode);
 }
 
 void StatusAreaViewChromeos::SystemResumed() {
@@ -59,8 +59,7 @@ void StatusAreaViewChromeos::SetDefaultUse24HourClock(bool use_24hour_clock) {
 void StatusAreaViewChromeos::AddChromeosButtons(
     StatusAreaView* status_area,
     StatusAreaButton::Delegate* delegate,
-    ScreenMode screen_mode,
-    ClockMenuButton** clock_button) {
+    ScreenMode screen_mode) {
   const bool border = true;
   const bool no_border = false;
 
@@ -70,10 +69,7 @@ void StatusAreaViewChromeos::AddChromeosButtons(
   status_area->AddButton(
       new AccessibilityMenuButton(delegate, screen_mode), border);
   status_area->AddButton(new CapsLockMenuButton(delegate), border);
-  ClockMenuButton* clock = new ClockMenuButton(delegate);
-  status_area->AddButton(clock, border);
-  if (clock_button)
-    *clock_button = clock;
+  status_area->AddButton(new ClockMenuButton(delegate), border);
 
   status_area->AddButton(
       new InputMethodMenuButton(delegate, screen_mode), no_border);

chrome/browser/chromeos/status/status_area_view_chromeos.h

@@ -12,8 +12,6 @@
 #include "chrome/browser/chromeos/system/timezone_settings.h"
 #include "chrome/browser/chromeos/view_ids.h"
 
-class ClockMenuButton;
-
 namespace chromeos {
 
 class StatusAreaViewChromeos : public StatusAreaView,
@@ -43,12 +41,9 @@ 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,
-                                 ClockMenuButton** clock_button);
+                                 ScreenMode screen_mode);
 
  private:
   void UpdateClockText();

chrome/browser/chromeos/status/timezone_clock_updater.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/chromeos/status/timezone_clock_updater.h"
-
-#include "chrome/browser/chromeos/status/clock_menu_button.h"
-#include "chrome/browser/chromeos/system/timezone_settings.h"
-
-TimezoneClockUpdater::TimezoneClockUpdater(ClockMenuButton* button)
-    : button_(button) {
-  chromeos::system::TimezoneSettings::GetInstance()->AddObserver(this);
-}
-
-TimezoneClockUpdater::~TimezoneClockUpdater() {
-  chromeos::system::TimezoneSettings::GetInstance()->RemoveObserver(this);
-}
-
-void TimezoneClockUpdater::TimezoneChanged(const icu::TimeZone& timezone) {
-  button_->UpdateText();
-}

chrome/browser/chromeos/status/timezone_clock_updater.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_TIMEZONE_CLOCK_UPDATER_H_
-#define CHROME_BROWSER_CHROMEOS_STATUS_TIMEZONE_CLOCK_UPDATER_H_
-#pragma once
-
-#include "chrome/browser/chromeos/system/timezone_settings.h"
-
-class ClockMenuButton;
-
-// TimezoneClockUpdater is responsible for updating a ClockMenuButton when the
-// timezone changes.
-class TimezoneClockUpdater
-    : public chromeos::system::TimezoneSettings::Observer {
- public:
-  explicit TimezoneClockUpdater(ClockMenuButton* button);
-  virtual ~TimezoneClockUpdater();
-
-  // TimezoneSettings::Observer overrides:
-  virtual void TimezoneChanged(const icu::TimeZone& timezone) OVERRIDE;
-
- private:
-  ClockMenuButton* button_;
-
-  DISALLOW_COPY_AND_ASSIGN(TimezoneClockUpdater);
-};
-
-#endif  // CHROME_BROWSER_CHROMEOS_STATUS_TIMEZONE_CLOCK_UPDATER_H_

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

@@ -12,20 +12,10 @@
 #include "ui/aura/window.h"
 #include "ui/aura_shell/launcher/launcher_types.h"
 
-// static
-ChromeShellDelegate* ChromeShellDelegate::instance_ = NULL;
-
 ChromeShellDelegate::ChromeShellDelegate() {
-  instance_ = this;
 }
 
 ChromeShellDelegate::~ChromeShellDelegate() {
-  if (instance_ == this)
-    instance_ = NULL;
-}
-
-const views::View* ChromeShellDelegate::GetStatusArea() const {
-  return status_area_host_->GetStatusArea();
 }
 
 // static

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

@@ -12,22 +12,14 @@
 #include "ui/aura_shell/launcher/launcher_types.h"
 #include "ui/aura_shell/shell_delegate.h"
 
-class Browser;
 class StatusAreaHostAura;
-
-namespace views {
-class View;
-}
+class Browser;
 
 class ChromeShellDelegate : public aura_shell::ShellDelegate {
  public:
   ChromeShellDelegate();
   virtual ~ChromeShellDelegate();
 
-  static ChromeShellDelegate* instance() { return instance_; }
-
-  const views::View* GetStatusArea() const;
-
   // Returns whether a launcher item should be created for |browser|. If an item
   // should be created |type| is set to the launcher type to create.
   static bool ShouldCreateLauncherItemForBrowser(
@@ -43,8 +35,6 @@ class ChromeShellDelegate : public aura_shell::ShellDelegate {
   virtual bool ConfigureLauncherItem(aura_shell::LauncherItem* item) OVERRIDE;
 
  private:
-  static ChromeShellDelegate* instance_;
-
   scoped_ptr<StatusAreaHostAura> status_area_host_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);

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

@@ -20,7 +20,6 @@
 
 #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()
@@ -28,13 +27,6 @@ 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(
@@ -45,12 +37,8 @@ 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,
-      &clock);
-  DCHECK(clock);
-  timezone_clock_updater_.reset(new TimezoneClockUpdater(clock));
+      status_area_view_, this, chromeos::StatusAreaViewChromeos::BROWSER_MODE);
 #else
   const bool border = true;
   const bool no_border = false;

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

@@ -10,20 +10,14 @@
 #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.
@@ -45,8 +39,6 @@ class StatusAreaHostAura : public StatusAreaButton::Delegate {
   // Owned by status_area_widget_.
   StatusAreaView* status_area_view_;
 
-  scoped_ptr<TimezoneClockUpdater> timezone_clock_updater_;
-
   DISALLOW_COPY_AND_ASSIGN(StatusAreaHostAura);
 };
 

chrome/chrome_browser.gypi

@@ -766,8 +766,6 @@
         'browser/chromeos/status/status_area_view.h',
         'browser/chromeos/status/status_area_view_chromeos.cc',
         'browser/chromeos/status/status_area_view_chromeos.h',
-        'browser/chromeos/status/timezone_clock_updater.cc',
-        'browser/chromeos/status/timezone_clock_updater.h',
         'browser/chromeos/system/name_value_pairs_parser.cc',
         'browser/chromeos/system/name_value_pairs_parser.h',
         'browser/chromeos/system/runtime_environment.cc',