Add SystemTrayObservers

ash/shell.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/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/focus_manager_factory.h"
@@ skipping 10 matching lines @@
 #include "ash/focus_cycler.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_delegate.h"
+#include "ash/system/tray/system_tray_notifier.h"
 #include "ash/tooltips/tooltip_controller.h"
 #include "ash/touch/touch_observer_hud.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/always_on_top_controller.h"
 #include "ash/wm/app_list_controller.h"
 #include "ash/wm/base_layout_manager.h"
 #include "ash/wm/capture_controller.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/custom_frame_view_ash.h"
 #include "ash/wm/dialog_frame_view.h"
@@ skipping 207 matching lines @@
 
   // AppList needs to be released before shelf layout manager, which is
   // destroyed with launcher container in the loop below. However, app list
   // container is now on top of launcher container and released after it.
   // TODO(xiyuan): Move it back when app list container is no longer needed.
   app_list_controller_.reset();
 
   // Destroy SystemTrayDelegate before destroying the status area(s).
   system_tray_delegate_.reset();
 
+  // Destroy SystemTrayNotifier immediately after destroying SystemTrayDelegate
+  // so that it is still available when shutting down the UI, but not after
+  // the notifier observers have been destroyed.
+  system_tray_notifier_.reset();
+
   // Destroy all child windows including widgets.
   display_controller_->CloseChildWindows();
 
   // These need a valid Shell instance to clean up properly, so explicitly
   // delete them before invalidating the instance.
   // Alphabetical.
   drag_drop_controller_.reset();
   magnification_controller_.reset();
   power_button_controller_.reset();
   session_state_controller_.reset();
@@ skipping 216 matching lines @@
     user_wallpaper_delegate_.reset(new DummyUserWallpaperDelegate());
 
   // StatusAreaWidget uses Shell's CapsLockDelegate.
   caps_lock_delegate_.reset(delegate_->CreateCapsLockDelegate());
 
   if (!command_line->HasSwitch(switches::kAuraNoShadows)) {
     resize_shadow_controller_.reset(new internal::ResizeShadowController());
     shadow_controller_.reset(new internal::ShadowController());
   }
 
+  // Create system_tray_notifier_ before the delegate.
+  system_tray_notifier_.reset(new ash::SystemTrayNotifier());
+
   // Initialize system_tray_delegate_ before initializing StatusAreaWidget.
   system_tray_delegate_.reset(delegate()->CreateSystemTrayDelegate());
   if (!system_tray_delegate_.get())
     system_tray_delegate_.reset(SystemTrayDelegate::CreateDummyDelegate());
 
   // Creates StatusAreaWidget.
   root_window_controller->InitForPrimaryDisplay();
 
   // Initialize system_tray_delegate_ after StatusAreaWidget is created.
   system_tray_delegate_->Initialize();
@@ skipping 323 matching lines @@
 
 bool Shell::CanAcceptEvents() {
   return true;
 }
 
 ui::EventTarget* Shell::GetParentTarget() {
   return NULL;
 }
 
 }  // namespace ash