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

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: tot-merge 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
« no previous file with comments | « mandoline/ui/desktop_ui/browser_window.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/window_manager_application.cc
diff --git a/mash/wm/window_manager_application.cc b/mash/wm/window_manager_application.cc
index bf58d79fda71ae11ca091965238c405ba91f73d2..25a58bf850718c40dce890d077a2a6e3168631a4 100644
--- a/mash/wm/window_manager_application.cc
+++ b/mash/wm/window_manager_application.cc
@@ -57,8 +57,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_->AddActivationParent(window->id());
window_manager_.reset(new WindowManagerImpl(this));
« no previous file with comments | « 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