Add SystemTrayObservers

ash/system/status_area_widget.cc

 // Copyright (c) 2012 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 "ash/system/status_area_widget.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
@@ skipping 28 matching lines @@
   GetNativeView()->SetName("StatusAreaWidget");
   GetNativeView()->SetProperty(internal::kStayInSameRootWindowKey, true);
 }
 
 StatusAreaWidget::~StatusAreaWidget() {
 }
 
 void StatusAreaWidget::CreateTrayViews() {
   AddSystemTray();
   AddWebNotificationTray();
-  // Initialize() must be called after all trays have been created.
+  SystemTrayDelegate* delegate = ash::Shell::GetInstance()->tray_delegate();
+  DCHECK(delegate);
+  // Initialize after all trays have been created.
   if (system_tray_)
-    system_tray_->Initialize();
+    system_tray_->InitializeTrayItems(delegate);
   if (web_notification_tray_)
     web_notification_tray_->Initialize();
-  UpdateAfterLoginStatusChange(
-      ash::Shell::GetInstance()->tray_delegate()->GetUserLoginStatus());
+  UpdateAfterLoginStatusChange(delegate->GetUserLoginStatus());
 }
 
 void StatusAreaWidget::Shutdown() {
   // Destroy the trays early, causing them to be removed from the view
   // hierarchy. Do not used scoped pointers since we don't want to destroy them
   // in the destructor if Shutdown() is not called (e.g. in tests).
   delete web_notification_tray_;
   web_notification_tray_ = NULL;
   delete system_tray_;
   system_tray_ = NULL;
@@ skipping 69 matching lines @@
     return;
   login_status_ = login_status;
   if (system_tray_)
     system_tray_->UpdateAfterLoginStatusChange(login_status);
   if (web_notification_tray_)
     web_notification_tray_->UpdateAfterLoginStatusChange(login_status);
 }
 
 }  // namespace internal
 }  // namespace ash