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 548 matching lines @@
   // 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_.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();
+  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();
 
   DCHECK(instance_ == this);
   instance_ = NULL;
@@ skipping 333 matching lines @@
   // Create desktop background widget.
   desktop_background_controller_->SetDesktopBackgroundImageMode();
 }
 
 void Shell::DisableWorkspaceGridLayout() {
   if (workspace_controller_.get())
     workspace_controller_->workspace_manager()->set_grid_size(0);
 }
 
 }  // namespace ash