diff options
| author | sadrul <sadrul@chromium.org> | 2015-11-23 23:46:07 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-24 07:47:05 +0000 |
| commit | 5b2aedd64f34977e6ef73e22681f4f0dbdc0ec42 (patch) | |
| tree | 498f50e55248aafa6ea84e9deac550f95840e12c /mash | |
| parent | 5010e358efb0ed2e250597cf071b6e3d258705f0 (diff) | |
| download | chromium_src-5b2aedd64f34977e6ef73e22681f4f0dbdc0ec42.zip chromium_src-5b2aedd64f34977e6ef73e22681f4f0dbdc0ec42.tar.gz chromium_src-5b2aedd64f34977e6ef73e22681f4f0dbdc0ec42.tar.bz2 | |
mus: Allow the WM to specify the windows that can have active children.
. The sample WindowManager creates various containers, and marks the container
for user windows to be allowed to have active windows. Other containers may
also be allowed to have active children in the future.
. For mandoline, the BrowserWindow (which is the WM) marks the root as being
able to contain active windows. Consequently, the browser window can be
properly activated.
. Raise a Window to the top when it becomes active.
BUG=548422
Review URL: https://codereview.chromium.org/1459463004
Cr-Commit-Position: refs/heads/master@{#361274}
Diffstat (limited to 'mash')
| -rw-r--r-- | mash/wm/window_manager_application.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mash/wm/window_manager_application.cc b/mash/wm/window_manager_application.cc index bf58d79..25a58bf 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)); |