Promotes remaining global window manager state into WindowManagerState

components/mus/ws/window_server.h

 // 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.
 
 #ifndef COMPONENTS_MUS_WS_WINDOW_SERVER_H_
 #define COMPONENTS_MUS_WS_WINDOW_SERVER_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 41 matching lines @@
   WindowServerDelegate* delegate() { return delegate_; }
 
   UserIdTracker* user_id_tracker() { return &user_id_tracker_; }
   const UserIdTracker* user_id_tracker() const { return &user_id_tracker_; }
 
   DisplayManager* display_manager() { return display_manager_.get(); }
   const DisplayManager* display_manager() const {
     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(
       const WindowId& id,
       const std::map<std::string, std::vector<uint8_t>>& properties);
 
   // Returns the id for the next WindowTree.
   ClientSpecificId GetAndAdvanceNextClientId();
 
   // See description of WindowTree::Embed() for details. This assumes
@@ skipping 203 matching lines @@
                               ServerWindow* transient_child) override;
   void OnTransientWindowRemoved(ServerWindow* window,
                                 ServerWindow* transient_child) override;
 
   // DisplayManagerDelegate:
   void OnFirstDisplayReady() override;
   void OnNoMoreDisplays() override;
   bool GetFrameDecorationsForUser(
       const UserId& user_id,
       mojom::FrameDecorationValuesPtr* values) override;
+  WindowManagerState* GetWindowManagerStateForUser(
+      const UserId& user_id) override;
 
   UserIdTracker user_id_tracker_;
 
   WindowServerDelegate* delegate_;
 
   // State for rendering into a Surface.
   scoped_refptr<mus::SurfacesState> surfaces_state_;
 
   // ID to use for next WindowTree.
   ClientSpecificId next_client_id_;
@@ skipping 13 matching lines @@
   // request.
   InFlightWindowManagerChangeMap in_flight_wm_change_map_;
 
   // Next id supplied to the window manager.
   uint32_t next_wm_change_id_;
 
   base::Callback<void(ServerWindow*)> window_paint_callback_;
 
   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);
 };
 
 }  // namespace ws
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_WINDOW_SERVER_H_