Commit 1c73edb2 authored by minch's avatar minch Committed by Commit Bot

capture_mode: Puts capture bar in MenuContainer.

Bug: 1142949
Change-Id: I0483368535561e9daf8715e11fce2f60054e70d0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2517925Reviewed-by: default avatarAhmed Fakhry <afakhry@chromium.org>
Commit-Queue: Min Chen <minch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825919}
parent 8768885b
...@@ -139,7 +139,7 @@ bool SetMouseWarpEnabled(bool enable) { ...@@ -139,7 +139,7 @@ bool SetMouseWarpEnabled(bool enable) {
aura::Window* GetParentContainer(aura::Window* root) { aura::Window* GetParentContainer(aura::Window* root) {
DCHECK(root); DCHECK(root);
DCHECK(root->IsRootWindow()); DCHECK(root->IsRootWindow());
return root->GetChildById(kShellWindowId_OverlayContainer); return root->GetChildById(kShellWindowId_MenuContainer);
} }
// Returns the smallest rect that contains all of |points|. // Returns the smallest rect that contains all of |points|.
......
...@@ -233,6 +233,7 @@ void ReparentAllWindows(aura::Window* src, aura::Window* dst) { ...@@ -233,6 +233,7 @@ void ReparentAllWindows(aura::Window* src, aura::Window* dst) {
kShellWindowId_UnparentedControlContainer, kShellWindowId_UnparentedControlContainer,
kShellWindowId_OverlayContainer, kShellWindowId_OverlayContainer,
kShellWindowId_LockActionHandlerContainer, kShellWindowId_LockActionHandlerContainer,
kShellWindowId_MenuContainer,
}; };
constexpr int kExtraContainerIdsToMoveInUnifiedMode[] = { constexpr int kExtraContainerIdsToMoveInUnifiedMode[] = {
kShellWindowId_LockScreenContainer, kShellWindowId_LockScreenContainer,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment