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

chrome/browser/ui/views/aura/chrome_shell_delegate.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/chrome_shell_delegate.h"
 
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/aura/app_list_window.h"
 #include "chrome/browser/ui/views/aura/status_area_host_aura.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #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
 bool ChromeShellDelegate::ShouldCreateLauncherItemForBrowser(
     Browser* browser,
     aura_shell::LauncherItemType* type) {
   if (browser->type() == Browser::TYPE_TABBED) {
     *type = aura_shell::TYPE_TABBED;
     return true;
   }
@@ skipping 26 matching lines @@
     const aura_shell::LauncherItem& item) {
   item.window->Activate();
 }
 
 bool ChromeShellDelegate::ConfigureLauncherItem(
     aura_shell::LauncherItem* item) {
   BrowserView* view = BrowserView::GetBrowserViewForNativeWindow(item->window);
   return view &&
       ShouldCreateLauncherItemForBrowser(view->browser(), &(item->type));
 }