mash/wm: Fix detecting container windows.

mash/wm/window_manager.cc

 // Copyright 2015 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/window_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 12 matching lines @@
 
 namespace mash {
 namespace wm {
 
 WindowManager::WindowManager()
     : root_controller_(nullptr),
       window_manager_client_(nullptr),
       binding_(this) {}
 
 WindowManager::~WindowManager() {
-  if (!root_controller_)
-    return;
-  for (auto container : root_controller_->root()->children()) {
-    container->RemoveObserver(this);
-    for (auto child : container->children())
-      child->RemoveObserver(this);
-  }
 }
 
 void WindowManager::Initialize(RootWindowController* root_controller,
                                session::mojom::Session* session) {
   DCHECK(root_controller);
   DCHECK(!root_controller_);
   root_controller_ = root_controller;
-  // The children of the root are considered containers.
-  for (auto container : root_controller_->root()->children()) {
-    container->AddObserver(this);
-    for (auto child : container->children())
-      child->AddObserver(this);
+
+  // Observe all the containers so that windows can be added to/removed from the
+  // |disconnected_app_handler_|.
+  int count = static_cast<int>(mojom::Container::COUNT);
+  for (int id = static_cast<int>(mojom::Container::ROOT) + 1; id < count;
+       ++id) {
+    mus::Window* container = root_controller_->GetWindowForContainer(
+        static_cast<mojom::Container>(id));
+    Add(container);
+
+    // Add any pre-existing windows in the container to
+    // |disconnected_app_handler_|.
+    for (auto child : container->children()) {
+      if (!root_controller_->WindowIsContainer(child))
+        disconnected_app_handler_.Add(child);
+    }
   }
 
   // The insets are roughly what is needed by CustomFrameView. The expectation
   // is at some point we'll write our own NonClientFrameView and get the insets
   // from it.
   mus::mojom::FrameDecorationValuesPtr frame_decoration_values =
       mus::mojom::FrameDecorationValues::New();
   const gfx::Insets client_area_insets =
       NonClientFrameController::GetPreferredClientAreaInsets();
   frame_decoration_values->normal_client_area_insets =
@@ skipping 42 matching lines @@
   const bool provide_non_client_frame =
       GetWindowType(*properties) == mus::mojom::WindowType::WINDOW;
   if (provide_non_client_frame)
     (*properties)[mus::mojom::kWaitForUnderlay_Property].clear();
 
   // TODO(sky): constrain and validate properties before passing to server.
   mus::Window* window = root->connection()->NewWindow(properties);
   window->SetBounds(CalculateDefaultBounds(window));
 
   mojom::Container container = GetRequestedContainer(window);
-  root_controller_->GetWindowForContainer(container)->AddChild(window);
+  mus::Window* container_window =
+      root_controller_->GetWindowForContainer(container);
+  DCHECK(root_controller_->WindowIsContainer(container_window));
+  container_window->AddChild(window);
 
   if (provide_non_client_frame) {
     NonClientFrameController::Create(root_controller_->GetConnector(), window,
                                      root_controller_->window_manager_client());
   }
 
   root_controller_->IncrementWindowCount();
 
   return window;
 }
 
 void WindowManager::OnTreeChanging(const TreeChangeParams& params) {
   DCHECK(root_controller_);
-  if (root_controller_->WindowIsContainer(params.old_parent))
-    params.target->RemoveObserver(this);
-  else if (root_controller_->WindowIsContainer(params.new_parent))
-    params.target->AddObserver(this);
-}
+  if (params.old_parent == params.receiver &&
+      root_controller_->WindowIsContainer(params.old_parent))
+    disconnected_app_handler_.Remove(params.target);
 
-void WindowManager::OnWindowEmbeddedAppDisconnected(mus::Window* window) {
-  window->Destroy();
+  if (params.new_parent == params.receiver &&
+      root_controller_->WindowIsContainer(params.new_parent))
+    disconnected_app_handler_.Add(params.target);
+
+  mus::WindowTracker::OnTreeChanging(params);
 }
 
 void WindowManager::SetWindowManagerClient(mus::WindowManagerClient* client) {
   window_manager_client_ = client;
 }
 
 bool WindowManager::OnWmSetBounds(mus::Window* window, gfx::Rect* bounds) {
   // By returning true the bounds of |window| is updated.
   return true;
 }
@@ skipping 22 matching lines @@
 
 void WindowManager::ScreenlockStateChanged(bool locked) {
   // Hide USER_PRIVATE windows when the screen is locked.
   mus::Window* window = root_controller_->GetWindowForContainer(
       mash::wm::mojom::Container::USER_PRIVATE);
   window->SetVisible(!locked);
 }
 
 }  // namespace wm
 }  // namespace mash