Promotes remaining global window manager state into WindowManagerState

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
index 0bb82a42c9166b2a0b49e42a5b20e1a8714d47d8..a851092bd48b6a1591d31e68a9c146bc9f3bfe7b 100644
--- a/components/mus/ws/window_manager_window_tree_factory.cc
+++ b/components/mus/ws/window_manager_window_tree_factory.cc
@@ -5,7 +5,6 @@
 #include "components/mus/ws/window_manager_window_tree_factory.h"
 
 #include "base/bind.h"
-#include "components/mus/ws/global_window_manager_state.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"
@@ -13,11 +12,6 @@
 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,
@@ -33,16 +27,6 @@ WindowManagerWindowTreeFactory::WindowManagerWindowTreeFactory(
 
 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) {
@@ -51,17 +35,8 @@ void WindowManagerWindowTreeFactory::CreateWindowTree(
   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);
-  }
+  SetWindowTree(GetWindowServer()->CreateTreeForWindowManager(
+      user_id_, std::move(window_tree_request), std::move(window_tree_client)));
 }
 
 WindowManagerWindowTreeFactory::WindowManagerWindowTreeFactory(
@@ -81,12 +56,8 @@ void WindowManagerWindowTreeFactory::SetWindowTree(WindowTree* window_tree) {
   DCHECK(!window_tree_);
   window_tree_ = window_tree;
 
-  global_window_manager_state_.reset(
-      new GlobalWindowManagerState(window_tree_));
-
-  if (!pending_request_)
-    window_manager_window_tree_factory_set_
-        ->OnWindowManagerWindowTreeFactoryReady(this);
+  window_manager_window_tree_factory_set_
+      ->OnWindowManagerWindowTreeFactoryReady(this);
 }
 
 }  // namespace ws