Shutdown the status tray before the system tray delegate.

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 <utility>
 
@@ skipping 458 matching lines @@
   keyboard::KeyboardController::ResetInstance(nullptr);
 }
 
 void Shell::ShowShelf() {
   RootWindowControllerList controllers = GetAllRootWindowControllers();
   for (RootWindowControllerList::iterator iter = controllers.begin();
        iter != controllers.end(); ++iter)
     (*iter)->ShowShelf();
 }
 
+void Shell::HideShelf() {
+  RootWindowControllerList controllers = GetAllRootWindowControllers();
+  for (RootWindowControllerList::iterator iter = controllers.begin();
+       iter != controllers.end(); ++iter) {
+    if ((*iter)->shelf())
+      (*iter)->shelf()->ShutdownStatusAreaWidget();
+  }
+}
+
 void Shell::AddShellObserver(ShellObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void Shell::RemoveShellObserver(ShellObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 #if defined(OS_CHROMEOS)
 bool Shell::ShouldSaveDisplaySettings() {
@@ skipping 224 matching lines @@
 
 #if defined(OS_CHROMEOS)
   // Destroy the LastWindowClosedLogoutReminder before the
   // LogoutConfirmationController.
   last_window_closed_logout_reminder_.reset();
 
   // Destroy the LogoutConfirmationController before the SystemTrayDelegate.
   logout_confirmation_controller_.reset();
 #endif
 
-  // Destroy SystemTrayDelegate before destroying the status area(s).
+  // Destroy the keyboard before closing the shelf, since it will invoke a shelf
+  // layout.
+  DeactivateKeyboard();
+
+  // Destroy SystemTrayDelegate before destroying the status area(s). Make sure
+  // to deinitialize the shelf first, as it is initialized after the delegate.
+  HideShelf();
   system_tray_delegate_->Shutdown();
   system_tray_delegate_.reset();
 
   locale_notification_controller_.reset();
 
   // Drag-and-drop must be canceled prior to close all windows.
   drag_drop_controller_.reset();
 
   // Controllers who have WindowObserver added must be deleted
   // before |window_tree_host_manager_| is deleted.
@@ skipping 436 matching lines @@
 
 void Shell::OnWindowActivated(
     aura::client::ActivationChangeObserver::ActivationReason reason,
     aura::Window* gained_active,
     aura::Window* lost_active) {
   if (gained_active)
     target_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash