Adds remainder of support for multiple roots to WS

ui/views/mus/window_manager_connection.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 "ui/views/mus/window_manager_connection.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
@@ skipping 92 matching lines @@
 
 // static
 WindowManagerConnection* WindowManagerConnection::Get() {
   WindowManagerConnection* connection = lazy_tls_ptr.Pointer()->Get();
   DCHECK(connection);
   return connection;
 }
 
 mus::Window* WindowManagerConnection::NewWindow(
     const std::map<std::string, std::vector<uint8_t>>& properties) {
+  if (window_tree_connection_)
+    return window_tree_connection_->NewTopLevelWindow(&properties);
+
   mus::mojom::WindowTreeClientPtr window_tree_client;
   mojo::InterfaceRequest<mus::mojom::WindowTreeClient>
       window_tree_client_request = GetProxy(&window_tree_client);
   window_manager_->OpenWindow(
       std::move(window_tree_client),
       mojo::Map<mojo::String, mojo::Array<uint8_t>>::From(properties));
 
   base::ThreadRestrictions::ScopedAllowWait allow_wait;
-  mus::WindowTreeConnection* window_tree_connection =
-      mus::WindowTreeConnection::Create(
-          this, std::move(window_tree_client_request),
-          mus::WindowTreeConnection::CreateType::WAIT_FOR_EMBED);
-  DCHECK_EQ(1u, window_tree_connection->GetRoots().size());
-  return *window_tree_connection->GetRoots().begin();
+  window_tree_connection_.reset(mus::WindowTreeConnection::Create(
+      this, std::move(window_tree_client_request),
+      mus::WindowTreeConnection::CreateType::WAIT_FOR_EMBED));
+  window_tree_connection_->SetDeleteOnNoRoots(false);
+  DCHECK_EQ(1u, window_tree_connection_->GetRoots().size());
+  return *window_tree_connection_->GetRoots().begin();
 }
 
 WindowManagerConnection::WindowManagerConnection(mojo::ApplicationImpl* app)
-    : app_(app) {
+    : app_(app), window_tree_connection_(nullptr) {
   app->ConnectToService("mojo:mus", &window_manager_);
 
   ui_init_.reset(new ui::mojo::UIInit(
       GetDisplaysFromWindowManager(&window_manager_)));
   ViewsDelegate::GetInstance()->set_native_widget_factory(
       base::Bind(&WindowManagerConnection::CreateNativeWidget,
                  base::Unretained(this)));
 }
 
-WindowManagerConnection::~WindowManagerConnection() {}
+WindowManagerConnection::~WindowManagerConnection() {
+  // ~WindowTreeConnection calls back to us (we're the WindowTreeDelegate),
+  // destroy it while we are still valid.
+  window_tree_connection_.reset();
+}
 
 void WindowManagerConnection::OnEmbed(mus::Window* root) {}
+
 void WindowManagerConnection::OnConnectionLost(
     mus::WindowTreeConnection* connection) {}
 
 NativeWidget* WindowManagerConnection::CreateNativeWidget(
     const Widget::InitParams& init_params,
     internal::NativeWidgetDelegate* delegate) {
   std::map<std::string, std::vector<uint8_t>> properties;
   NativeWidgetMus::ConfigurePropertiesForNewWindow(init_params, &properties);
   return new NativeWidgetMus(delegate, app_->shell(), NewWindow(properties),
                              mus::mojom::SURFACE_TYPE_DEFAULT);
 }
 
 }  // namespace views