Index: ash/mus/bridge/wm_root_window_controller_mus.cc |
diff --git a/ash/mus/bridge/wm_root_window_controller_mus.cc b/ash/mus/bridge/wm_root_window_controller_mus.cc |
index 46531b5132d956947ab7843e360a1582200b930f..28f7425222e3ad53d703ac29ff3838661770a6e7 100644 |
--- a/ash/mus/bridge/wm_root_window_controller_mus.cc |
+++ b/ash/mus/bridge/wm_root_window_controller_mus.cc |
@@ -75,6 +75,10 @@ const display::Display& WmRootWindowControllerMus::GetDisplay() const { |
return root_window_controller_->display(); |
} |
+void WmRootWindowControllerMus::MoveWindowsTo(WmWindow* dest) { |
+ WmRootWindowController::MoveWindowsTo(dest); |
+} |
+ |
bool WmRootWindowControllerMus::HasShelf() { |
return GetShelf() != nullptr; |
} |
@@ -83,10 +87,6 @@ WmShell* WmRootWindowControllerMus::GetShell() { |
return shell_; |
} |
-AlwaysOnTopController* WmRootWindowControllerMus::GetAlwaysOnTopController() { |
- return root_window_controller_->always_on_top_controller(); |
-} |
- |
WmShelf* WmRootWindowControllerMus::GetShelf() { |
return root_window_controller_->wm_shelf(); |
} |
@@ -127,5 +127,12 @@ gfx::Point WmRootWindowControllerMus::GetLastMouseLocationInRoot() { |
return location; |
} |
+bool WmRootWindowControllerMus::ShouldDestroyWindowInCloseChildWindows( |
+ WmWindow* window) { |
+ ui::Window* ui_window = WmWindowMus::GetMusWindow(window); |
+ return ui_window->WasCreatedByThisClient() || |
+ ui_window->window_tree()->GetRoots().count(ui_window); |
+} |
+ |
} // namespace mus |
} // namespace ash |