Random fixes for mash bridge classes

mash/wm/bridge/wm_globals_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 "mash/wm/bridge/wm_globals_mus.h"
 
 #include "ash/wm/common/window_resizer.h"
 #include "ash/wm/common/wm_activation_observer.h"
 #include "ash/wm/common/wm_shell_window_ids.h"
 #include "components/mus/common/util.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "mash/wm/bridge/wm_root_window_controller_mus.h"
 #include "mash/wm/bridge/wm_window_mus.h"
+#include "mash/wm/container_ids.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
 #include "mash/wm/root_window_controller.h"
 
 namespace mash {
 namespace wm {
 
 WmGlobalsMus::WmGlobalsMus(mus::WindowTreeConnection* connection)
     : connection_(connection) {
   connection_->AddObserver(this);
   WmGlobals::Set(this);
 }
 
 WmGlobalsMus::~WmGlobalsMus() {
-  connection_->RemoveObserver(this);
+  RemoveConnectionObserver();
   WmGlobals::Set(nullptr);
 }
 
 // static
 WmGlobalsMus* WmGlobalsMus::Get() {
   return static_cast<WmGlobalsMus*>(ash::wm::WmGlobals::Get());
 }
 
 void WmGlobalsMus::AddRootWindowController(
     WmRootWindowControllerMus* controller) {
@@ skipping 126 matching lines @@
   NOTIMPLEMENTED();
 }
 
 void WmGlobalsMus::RemoveOverviewModeObserver(
     ash::wm::WmOverviewModeObserver* observer) {
   NOTIMPLEMENTED();
 }
 
 // static
 bool WmGlobalsMus::IsActivationParent(mus::Window* window) {
-  return window && window->local_id() == ash::kShellWindowId_DefaultContainer;
+  if (!window)
+    return false;
+
+  for (size_t i = 0; i < kNumActivationContainers; ++i) {
+    if (window->local_id() == static_cast<int>(kActivationContainers[i]))
+      return true;
+  }
+  return false;
+}
+
+void WmGlobalsMus::RemoveConnectionObserver() {
+  if (!connection_)
+    return;
+
+  connection_->RemoveObserver(this);
+  connection_ = nullptr;
 }
 
 void WmGlobalsMus::OnWindowTreeFocusChanged(mus::Window* gained_focus,
                                             mus::Window* lost_focus) {
   WmWindowMus* gained_active = GetToplevelAncestor(gained_focus);
   WmWindowMus* lost_active = GetToplevelAncestor(gained_focus);
   if (gained_active == lost_active)
     return;
 
   FOR_EACH_OBSERVER(ash::wm::WmActivationObserver, activation_observers_,
                     OnWindowActivated(gained_active, lost_active));
 }
 
+void WmGlobalsMus::OnWillDestroyConnection(
+    mus::WindowTreeConnection* connection) {
+  DCHECK_EQ(connection, connection_);
+  RemoveConnectionObserver();
+}
+
 }  // namespace wm
 }  // namespace mash