Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2665)

Unified Diff: ash/mus/bridge/wm_shell_mus.cc

Issue 2033843003: Makes ash/mus use RootWindowControllerCommon (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_mash_wm
Patch Set: merge fail 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/mus/background_layout.cc ('k') | ash/mus/bridge/wm_window_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_shell_mus.cc
diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc
index 8d254ee4f37ab6cd2075bf7ab50175b783a3dbf7..67fa439caf3c92ea749f7cd0ca5892a9ce3d99ee 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -184,8 +184,9 @@ bool WmShellMus::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;
« no previous file with comments | « ash/mus/background_layout.cc ('k') | ash/mus/bridge/wm_window_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698