Promotes remaining global window manager state into WindowManagerState

components/mus/ws/window_server.h

Index: components/mus/ws/window_server.h
diff --git a/components/mus/ws/window_server.h b/components/mus/ws/window_server.h
index 9a2d5727293dbec54d4a5e895657c6ddb7e0be91..d8e463d0207406044491675a93519a38891b51fe 100644
--- a/components/mus/ws/window_server.h
+++ b/components/mus/ws/window_server.h
@@ -59,8 +59,6 @@ class WindowServer : public ServerWindowDelegate,
     return display_manager_.get();
   }
 
-  bool created_one_display() const { return created_one_display_; }
-
   // Creates a new ServerWindow. The return value is owned by the caller, but
   // must be destroyed before WindowServer.
   ServerWindow* CreateServerWindow(
@@ -284,6 +282,8 @@ class WindowServer : public ServerWindowDelegate,
   bool GetFrameDecorationsForUser(
       const UserId& user_id,
       mojom::FrameDecorationValuesPtr* values) override;
+  WindowManagerState* GetWindowManagerStateForUser(
+      const UserId& user_id) override;
 
   UserIdTracker user_id_tracker_;
 
@@ -317,10 +317,6 @@ class WindowServer : public ServerWindowDelegate,
 
   WindowManagerWindowTreeFactorySet window_manager_window_tree_factory_set_;
 
-  // TODO(sky): remove this, temporary until window manager state made global
-  // and not per display.
-  bool created_one_display_ = false;
-
   DISALLOW_COPY_AND_ASSIGN(WindowServer);
 };