Shutdown the status tray before the system tray delegate.

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index d42c788367fc4b75a397f7a5db3912163d4d4967..98af408a8928ad6cb5933edf973f94c62115aefe 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -476,6 +476,15 @@ void Shell::ShowShelf() {
     (*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);
 }
@@ -720,7 +729,13 @@ Shell::~Shell() {
   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();