components/mus/ws/server_window.cc - Issue 1818333002: Reland: mus: Enable system modal windows

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: components/mus/ws/server_window.cc

Issue 1818333002: Reland: mus: Enable system modal windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Cleaned up comments Created 4 years, 8 months 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: components/mus/ws/server_window.cc

diff --git a/components/mus/ws/server_window.cc b/components/mus/ws/server_window.cc

index eeb5d7d44929e0275c949faff176438dcd2b5b56..7ee5df9a0447233e4bff95a29b5c95d7e1056353 100644

--- a/components/mus/ws/server_window.cc

+++ b/components/mus/ws/server_window.cc

@@ -229,6 +229,9 @@ ServerWindow* ServerWindow::GetChildWindow(const WindowId& window_id) {

}

void ServerWindow::AddTransientWindow(ServerWindow* child) {

+ // A system modal window cannot become a transient child.

+ DCHECK(!child->is_modal() || child->transient_parent());

if (child->transient_parent())

child->transient_parent()->RemoveTransientWindow(child);