Close notification windows while message loop is still active

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 "ash/app_list/app_list.h"
 #include "ash/ash_switches.h"
@@ skipping 463 matching lines @@
                                       std::string* toup_url) OVERRIDE {
     return false;
   }
 
   virtual void ShowCellularTopupURL(const std::string& topup_url) OVERRIDE {
   }
 
   virtual void ChangeProxySettings() OVERRIDE {
   }
 
+  virtual void OnTrayDestroyed() OVERRIDE {
+  }
+
   bool muted_;
   bool wifi_enabled_;
   bool cellular_enabled_;
   bool bluetooth_enabled_;
   float volume_;
   SkBitmap null_image_;
 
   DISALLOW_COPY_AND_ASSIGN(DummySystemTrayDelegate);
 };
 
@@ skipping 29 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, public:
 
 Shell::Shell(ShellDelegate* delegate)
     : root_window_(aura::MonitorManager::CreateRootWindowForPrimaryMonitor()),
       screen_(new ScreenAsh(root_window_.get())),
       root_filter_(NULL),
       delegate_(delegate),
       shelf_(NULL),
       root_window_layout_(NULL),
-      status_widget_(NULL) {
+      status_widget_(NULL),
+      shutdown_(false) {
   gfx::Screen::SetInstance(screen_);
   ui_controls::InstallUIControlsAura(CreateUIControlsAura(root_window_.get()));
 }
 
 Shell::~Shell() {
-  RemoveRootWindowEventFilter(key_rewriter_filter_.get());
-  RemoveRootWindowEventFilter(partial_screenshot_filter_.get());
-  RemoveRootWindowEventFilter(input_method_filter_.get());
-  RemoveRootWindowEventFilter(window_modality_controller_.get());
-  RemoveRootWindowEventFilter(system_gesture_filter_.get());
-#if !defined(OS_MACOSX)
-  RemoveRootWindowEventFilter(accelerator_filter_.get());
-#endif
-
-  // Close background widget now so that the focus manager of the
-  // widget gets deleted in the final message loop run.
-  root_window_layout_->SetBackgroundWidget(NULL);
-
-  // TooltipController is deleted with the Shell so removing its references.
-  RemoveRootWindowEventFilter(tooltip_controller_.get());
-  aura::client::SetTooltipClient(GetRootWindow(), NULL);
-
-  // Make sure we delete WorkspaceController before launcher is
-  // deleted as it has a reference to launcher model.
-  workspace_controller_.reset();
-
-  // The system tray needs to be reset before all the windows are destroyed.
-  tray_.reset();
-
-  // Desroy secondary monitor's widgets before all the windows are destroyed.
-  monitor_controller_.reset();
-
-  // Delete containers now so that child windows does not access
-  // observers when they are destructed.
-  aura::RootWindow* root_window = GetRootWindow();
-  while (!root_window->children().empty()) {
-    aura::Window* child = root_window->children()[0];
-    delete child;
-  }
-
-  // These need a valid Shell instance to clean up properly, so explicitly
-  // delete them before invalidating the instance.
-  // Alphabetical.
-  activation_controller_.reset();
-  drag_drop_controller_.reset();
-  resize_shadow_controller_.reset();
-  shadow_controller_.reset();
-  window_cycle_controller_.reset();
-  event_client_.reset();
-  monitor_controller_.reset();
-
-  // Launcher widget has a InputMethodBridge that references to
-  // input_method_filter_'s input_method_. So explicitly release launcher_
-  // before input_method_filter_. And this needs to be after we delete all
-  // containers in case there are still live browser windows which access
-  // LauncherModel during close.
-  launcher_.reset();
-
+  if (!shutdown_)
+    Shutdown();
   DCHECK(instance_ == this);
   instance_ = NULL;
 }
 
 // static
 Shell* Shell::CreateInstance(ShellDelegate* delegate) {
   CHECK(!instance_);
   aura::Env::GetInstance()->SetMonitorManager(
       new internal::MultiMonitorManager());
   instance_ = new Shell(delegate);
@@ skipping 17 matching lines @@
   delete instance_;
   instance_ = NULL;
 }
 
 // static
 aura::RootWindow* Shell::GetRootWindow() {
   return GetInstance()->root_window_.get();
 }
 
 void Shell::Init() {
+  DCHECK(!shutdown_);
   aura::RootWindow* root_window = GetRootWindow();
   root_filter_ = new internal::RootWindowEventFilter(root_window);
 #if !defined(OS_MACOSX)
   nested_dispatcher_controller_.reset(new NestedDispatcherController);
   accelerator_controller_.reset(new AcceleratorController);
 #endif
   // Pass ownership of the filter to the root window.
   GetRootWindow()->SetEventFilter(root_filter_);
 
   // KeyRewriterEventFilter must be the first one.
@@ skipping 140 matching lines @@
 
 aura::Window* Shell::GetContainer(int container_id) {
   return const_cast<aura::Window*>(
       const_cast<const Shell*>(this)->GetContainer(container_id));
 }
 
 const aura::Window* Shell::GetContainer(int container_id) const {
   return GetRootWindow()->GetChildById(container_id);
 }
 
+void Shell::Shutdown() {
+  DCHECK(!shutdown_);
+  shutdown_ = true;
+
+  RemoveRootWindowEventFilter(key_rewriter_filter_.get());
+  RemoveRootWindowEventFilter(partial_screenshot_filter_.get());
+  RemoveRootWindowEventFilter(input_method_filter_.get());
+  RemoveRootWindowEventFilter(window_modality_controller_.get());
+  RemoveRootWindowEventFilter(system_gesture_filter_.get());
+#if !defined(OS_MACOSX)
+  RemoveRootWindowEventFilter(accelerator_filter_.get());
+#endif
+
+  // Close background widget now so that the focus manager of the
+  // widget gets deleted in the final message loop run.
+  root_window_layout_->SetBackgroundWidget(NULL);
+
+  // TooltipController is deleted with the Shell so removing its references.
+  RemoveRootWindowEventFilter(tooltip_controller_.get());
+  aura::client::SetTooltipClient(GetRootWindow(), NULL);
+
+  // Make sure we delete WorkspaceController before launcher is
+  // deleted as it has a reference to launcher model.
+  workspace_controller_.reset();
+
+  // The system tray needs to be reset before all the windows are destroyed.
+  tray_.reset();
+  tray_delegate_->OnTrayDestroyed();
+
+  // Desroy secondary monitor's widgets before all the windows are destroyed.
+  monitor_controller_.reset();
+
+  // Delete containers now so that child windows does not access
+  // observers when they are destructed.
+  aura::RootWindow* root_window = GetRootWindow();
+  while (!root_window->children().empty()) {
+    aura::Window* child = root_window->children()[0];
+    delete child;
+  }
+
+  // These need a valid Shell instance to clean up properly, so explicitly
+  // delete them before invalidating the instance.
+  // Alphabetical.
+  activation_controller_.reset();
+  drag_drop_controller_.reset();
+  resize_shadow_controller_.reset();
+  shadow_controller_.reset();
+  window_cycle_controller_.reset();
+  event_client_.reset();
+  monitor_controller_.reset();
+  tooltip_controller_.reset();
+
+  // Launcher widget has a InputMethodBridge that references to
+  // input_method_filter_'s input_method_. So explicitly release launcher_
+  // before input_method_filter_. And this needs to be after we delete all
+  // containers in case there are still live browser windows which access
+  // LauncherModel during close.
+  launcher_.reset();
+}
+
 void Shell::AddRootWindowEventFilter(aura::EventFilter* filter) {
   static_cast<internal::RootWindowEventFilter*>(
       GetRootWindow()->event_filter())->AddFilter(filter);
 }
 
 void Shell::RemoveRootWindowEventFilter(aura::EventFilter* filter) {
   static_cast<internal::RootWindowEventFilter*>(
       GetRootWindow()->event_filter())->RemoveFilter(filter);
 }
 
@@ skipping 139 matching lines @@
   desktop_background_controller_->SetDesktopBackgroundImageMode(
       GetWallpaper(index), GetWallpaperInfo(index).layout);
 }
 
 void Shell::DisableWorkspaceGridLayout() {
   if (workspace_controller_.get())
     workspace_controller_->workspace_manager()->set_grid_size(0);
 }
 
 }  // namespace ash