Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(159)

Unified Diff: ash/mus/window_manager.cc

Issue 2247503002: mash: Create and show a shelf in mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix WindowManager WmShell::Shutdown; delay PointerWatcherEventRouter teardown; cleanup shutdown wor… Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/mus/window_manager.cc
diff --git a/ash/mus/window_manager.cc b/ash/mus/window_manager.cc
index ed46d9e254ced7584ed7000fc920d367335b4045..a0126dba54709d6cca30f958e72029177a585262 100644
--- a/ash/mus/window_manager.cc
+++ b/ash/mus/window_manager.cc
@@ -215,6 +215,7 @@ void WindowManager::OnDidDestroyClient(ui::WindowTreeClient* client) {
DCHECK(root_window_controllers_.empty());
lookup_.reset();
+ shell_->Shutdown();
shell_.reset();
shadow_controller_.reset();

Powered by Google App Engine
This is Rietveld 408576698