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

Unified Diff: mash/wm/window_manager_application.cc

Issue 1459463004: mus: Allow the WM to specify the windows that can have active children. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 1 month 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: mash/wm/window_manager_application.cc
diff --git a/mash/wm/window_manager_application.cc b/mash/wm/window_manager_application.cc
index 388c55fdcf11df75a36910b15c80f6987df3872e..4e88b34c9c9b0d10a644deb6d06cb5aefa4429b5 100644
--- a/mash/wm/window_manager_application.cc
+++ b/mash/wm/window_manager_application.cc
@@ -55,8 +55,12 @@ void WindowManagerApplication::OnEmbed(mus::Window* root) {
GetWindowForContainer(mash::wm::mojom::CONTAINER_USER_BACKGROUND)));
shelf_layout_.reset(new ShelfLayout(
GetWindowForContainer(mash::wm::mojom::CONTAINER_USER_SHELF)));
+
+ mus::Window* window =
+ GetWindowForContainer(mash::wm::mojom::CONTAINER_USER_WINDOWS);
window_layout_.reset(new WindowLayout(
GetWindowForContainer(mash::wm::mojom::CONTAINER_USER_WINDOWS)));
+ host_->SetActivationParent(window->id(), true);
window_manager_.reset(new WindowManagerImpl(this));
« components/mus/ws/window_tree_host_impl.cc ('K') | « mandoline/ui/desktop_ui/browser_window.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698