Adds remainder of support for multiple roots to WS

components/mus/ws/connection_manager.cc

 // Copyright 2014 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 "components/mus/ws/connection_manager.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "components/mus/ws/client_connection.h"
 #include "components/mus/ws/connection_manager_delegate.h"
@@ skipping 120 matching lines @@
   DCHECK(service_connection_it != connection_map_.end());
 
   // Tear down the associated WindowTree connection.
   // TODO(fsamuel): I don't think this is quite right, we should tear down all
   // connections within the root's viewport. We should probably employ an
   // observer pattern to do this. Each WindowTreeImpl should track its
   // parent's lifetime.
   host_connection_map_.erase(it);
   OnConnectionError(service_connection_it->second);
 
+  for (auto& pair : connection_map_) {
+    pair.second->service()->OnWillDestroyWindowTreeHost(
+        connection->window_tree_host());
+  }
+
   // If we have no more roots left, let the app know so it can terminate.
   if (!host_connection_map_.size())
     delegate_->OnNoMoreRootConnections();
 }
 
 WindowTreeImpl* ConnectionManager::EmbedAtWindow(
     ServerWindow* root,
     uint32_t policy_bitmask,
     mojom::WindowTreeClientPtr client) {
   mojom::WindowTreePtr service_ptr;
@@ skipping 112 matching lines @@
   InFlightWindowManagerChange change;
   if (!GetAndClearInFlightWindowManagerChange(window_manager_change_id,
                                               &change)) {
     return;
   }
 
   WindowTreeImpl* connection = GetConnection(change.connection_id);
   connection->OnChangeCompleted(change.client_change_id, success);
 }
 
+void ConnectionManager::WindowManagerCreatedTopLevelWindow(
+    WindowTreeImpl* wm_connection,
+    uint32_t window_manager_change_id,
+    Id transport_window_id) {
+  InFlightWindowManagerChange change;
+  if (!GetAndClearInFlightWindowManagerChange(window_manager_change_id,
+                                              &change)) {
+    return;
+  }
+
+  const WindowId window_id(WindowIdFromTransportId(transport_window_id));
+  const ServerWindow* window = GetWindow(window_id);
+  WindowTreeImpl* connection = GetConnection(change.connection_id);
+  // The window manager should have created the window already, and it should
+  // be ready for embedding.
+  if (!connection->IsWaitingForNewTopLevelWindow(window_manager_change_id) ||
+      !window || window->id().connection_id != wm_connection->id() ||
+      !window->children().empty() || GetConnectionWithRoot(window)) {
+    WindowManagerSentBogusMessage(connection);
+    return;
+  }
+
+  connection->OnWindowManagerCreatedTopLevelWindow(
+      window_manager_change_id, change.client_change_id, window_id);
+}
+
 void ConnectionManager::ProcessWindowBoundsChanged(
     const ServerWindow* window,
     const gfx::Rect& old_bounds,
     const gfx::Rect& new_bounds) {
   for (auto& pair : connection_map_) {
     pair.second->service()->ProcessWindowBoundsChanged(
         window, old_bounds, new_bounds, IsOperationSource(pair.first));
   }
 }
 
@@ skipping 265 matching lines @@
     return;
   for (auto& pair : connection_map_) {
     pair.second->service()->ProcessTransientWindowRemoved(
         window, transient_child, IsOperationSource(pair.first));
   }
 }
 
 }  // namespace ws
 
 }  // namespace mus