Changes how window manager obtains WindowTree from mus

components/mus/ws/window_manager_window_tree_factory.cc

Index: components/mus/ws/window_manager_window_tree_factory.cc
diff --git a/components/mus/ws/window_manager_window_tree_factory.cc b/components/mus/ws/window_manager_window_tree_factory.cc
new file mode 100644
index 0000000000000000000000000000000000000000..eaf8e9316280491e8b5f903aeca3c295c9bcd96a
--- /dev/null
+++ b/components/mus/ws/window_manager_window_tree_factory.cc
@@ -0,0 +1,89 @@
+// 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 "components/mus/ws/window_manager_window_tree_factory.h"
+
+#include "base/bind.h"
+#include "components/mus/ws/window_manager_window_tree_factory_set.h"
+#include "components/mus/ws/window_server.h"
+#include "components/mus/ws/window_tree.h"
+
+namespace mus {
+namespace ws {
+
+struct WindowManagerWindowTreeFactory::PendingRequest {
+  mojom::WindowTreeRequest window_tree_request;
+  mojom::WindowTreeClientPtr window_tree_client;
+};
+
+WindowManagerWindowTreeFactory::WindowManagerWindowTreeFactory(
+    WindowManagerWindowTreeFactorySet* window_manager_window_tree_factory_set,
+    const UserId& user_id,
+    mojo::InterfaceRequest<mojom::WindowManagerWindowTreeFactory> request)
+    : window_manager_window_tree_factory_set_(
+          window_manager_window_tree_factory_set),
+      user_id_(user_id),
+      binding_(this),
+      window_tree_(nullptr) {
+  if (request.is_pending())
+    binding_.Bind(std::move(request));
+}
+
+WindowManagerWindowTreeFactory::~WindowManagerWindowTreeFactory() {}
+
+void WindowManagerWindowTreeFactory::BindPendingRequest() {
+  if (!pending_request_)
+    return;
+
+  SetWindowTree(GetWindowServer()->CreateTreeForWindowManager(
+      user_id_, std::move(pending_request_->window_tree_request),
+      std::move(pending_request_->window_tree_client)));
+  pending_request_.reset();
+}
+
+void WindowManagerWindowTreeFactory::CreateWindowTree(
+    mojom::WindowTreeRequest window_tree_request,
+    mojom::WindowTreeClientPtr window_tree_client) {
+  // CreateWindowTree() can only be called once, so there is no reason to keep
+  // the binding around.
+  if (binding_.is_bound())
+    binding_.Close();
+
+  if (GetWindowServer()->created_one_display()) {
+    SetWindowTree(GetWindowServer()->CreateTreeForWindowManager(
+        user_id_, std::move(window_tree_request),
+        std::move(window_tree_client)));
+  } else {
+    pending_request_.reset(new PendingRequest);
+    pending_request_->window_tree_request = std::move(window_tree_request);
+    pending_request_->window_tree_client = std::move(window_tree_client);
+    window_manager_window_tree_factory_set_
+        ->OnWindowManagerWindowTreeFactoryReady(this);
+  }
+}
+
+WindowManagerWindowTreeFactory::WindowManagerWindowTreeFactory(
+    WindowManagerWindowTreeFactorySet* window_manager_window_tree_factory_set,
+    const UserId& user_id)
+    : window_manager_window_tree_factory_set_(
+          window_manager_window_tree_factory_set),
+      user_id_(user_id),
+      binding_(this),
+      window_tree_(nullptr) {}
+
+WindowServer* WindowManagerWindowTreeFactory::GetWindowServer() {
+  return window_manager_window_tree_factory_set_->window_server();
+}
+
+void WindowManagerWindowTreeFactory::SetWindowTree(WindowTree* window_tree) {
+  DCHECK(!window_tree_);
+  window_tree_ = window_tree;
+
+  if (!pending_request_)
+    window_manager_window_tree_factory_set_
+        ->OnWindowManagerWindowTreeFactoryReady(this);
+}
+
+}  // namespace ws
+}  // namespace mus