Makes ash/mus use RootWindowControllerCommon

ash/mus/bridge/wm_shell_mus.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/mus/bridge/wm_shell_mus.h"
 
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_resizer.h"
 #include "ash/common/wm_activation_observer.h"
 #include "ash/mus/bridge/wm_root_window_controller_mus.h"
@@ skipping 166 matching lines @@
 
 void WmShellMus::RemoveOverviewModeObserver(WmOverviewModeObserver* observer) {
   NOTIMPLEMENTED();
 }
 
 // static
 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;
 }
 
 void WmShellMus::RemoveClientObserver() {
   if (!client_)
     return;
 
   client_->RemoveObserver(this);
@@ skipping 12 matching lines @@
                     OnWindowActivated(gained_active, lost_active));
 }
 
 void WmShellMus::OnWillDestroyClient(::mus::WindowTreeClient* client) {
   DCHECK_EQ(client, client_);
   RemoveClientObserver();
 }
 
 }  // namespace mus
 }  // namespace ash