ash/mus/bridge/wm_globals_mus.cc - Issue 2033843003: Makes ash/mus use RootWindowControllerCommon

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/mus/bridge/wm_globals_mus.cc

Issue 2033843003: Makes ash/mus use RootWindowControllerCommon (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_mash_wm

Patch Set: git cl add Created 4 years, 6 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: ash/mus/bridge/wm_globals_mus.cc

diff --git a/ash/mus/bridge/wm_globals_mus.cc b/ash/mus/bridge/wm_globals_mus.cc

index fc7249a06f1d53e3bdfc0cd826c70c7f593afab7..b0cd51c9e1d1cd658d262de06073b0c5c4e92d98 100644

--- a/ash/mus/bridge/wm_globals_mus.cc

+++ b/ash/mus/bridge/wm_globals_mus.cc

@@ -187,8 +187,9 @@ bool WmGlobalsMus::IsActivationParent(::mus::Window* window) {

if (!window)

return false;

- for (size_t i = 0; i < kNumActivationContainers; ++i) {

- if (window->local_id() == static_cast<int>(kActivationContainers[i]))

+ const int shell_window_id = WmWindowMus::Get(window)->GetShellWindowId();

+ for (size_t i = 0; i < kNumActivatableShellWindowIds; ++i) {

+ if (shell_window_id == kActivatableShellWindowIds[i])

return true;

}

return false;