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

Unified Diff: ash/mus/root_window_controller.cc

Issue 2302673002: mash: Avoid shelf crashes on display removal. (Closed)
Patch Set: minor cleanup. Created 4 years, 3 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/root_window_controller.cc
diff --git a/ash/mus/root_window_controller.cc b/ash/mus/root_window_controller.cc
index f9584af0e17b02428c77c52f56eab04970270d7f..4768f3f6ebdb689f1f389b73964464d84d111ca3 100644
--- a/ash/mus/root_window_controller.cc
+++ b/ash/mus/root_window_controller.cc
@@ -135,6 +135,10 @@ WmWindowMus* RootWindowController::GetWindowByShellWindowId(int id) {
WmWindowMus::Get(root_)->GetChildByShellWindowId(id));
}
+void RootWindowController::Shutdown() {
+ wm_shelf_->ShutdownShelfWidget();
sky 2016/09/01 23:51:17 Can this be moved to WmRootWindowController? I thi
+}
+
gfx::Rect RootWindowController::CalculateDefaultBounds(
ui::Window* window) const {
if (window->HasSharedProperty(

Powered by Google App Engine
This is Rietveld 408576698