ash/root_window_controller.cc - Issue 754763005: Speculative fix for sticky keys overlay crash.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/root_window_controller.cc

Issue 754763005: Speculative fix for sticky keys overlay crash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add more asserts Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ash/root_window_controller.cc

diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc

index fb41c216680694735725f72da187cd46094cd1da..fdebffa9ca945036f78bc1bbe2c3706d438aa7e4 100644

--- a/ash/root_window_controller.cc

+++ b/ash/root_window_controller.cc

@@ -162,7 +162,8 @@ void ReparentAllWindows(aura::Window* src, aura::Window* dst) {

kShellWindowId_AlwaysOnTopContainer,

kShellWindowId_SystemModalContainer,

kShellWindowId_LockSystemModalContainer,

- kShellWindowId_UnparentedControlContainer, };

+ kShellWindowId_UnparentedControlContainer,

+ kShellWindowId_OverlayContainer, };

for (size_t i = 0; i < arraysize(kContainerIdsToMove); i++) {

int id = kContainerIdsToMove[i];

aura::Window* src_container = Shell::GetContainer(src, id);