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

Unified Diff: ash/mus/bridge/wm_root_window_controller_mus.cc

Issue 2350953009: Centralizes more shared code between ash and mash (Closed)
Patch Set: feedback 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
« no previous file with comments | « ash/mus/bridge/wm_root_window_controller_mus.h ('k') | ash/mus/bridge/wm_shelf_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « ash/mus/bridge/wm_root_window_controller_mus.h ('k') | ash/mus/bridge/wm_shelf_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698