Promotes remaining global window manager state into WindowManagerState

components/mus/ws/window_tree.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_TREE_H_
 #define COMPONENTS_MUS_WS_WINDOW_TREE_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 23 matching lines @@
 class Event;
 }
 
 namespace mus {
 namespace ws {
 
 class AccessPolicy;
 class DisplayManager;
 class Display;
 class EventMatcher;
-class GlobalWindowManagerState;
 class ServerWindow;
 class TargetedEvent;
+class WindowManagerDisplayRoot;
 class WindowManagerState;
 class WindowServer;
 class WindowTreeTest;
 
 namespace test {
 class WindowTreeTestApi;
 }
 
 // WindowTree represents a view onto portions of the window tree. The parts of
 // the tree exposed to the client start at the root windows. A WindowTree may
@@ skipping 10 matching lines @@
  public:
   WindowTree(WindowServer* window_server,
              const UserId& user_id,
              ServerWindow* root,
              std::unique_ptr<AccessPolicy> access_policy);
   ~WindowTree() override;
 
   void Init(std::unique_ptr<WindowTreeBinding> binding,
             mojom::WindowTreePtr tree);
 
-  // Called if this WindowTree hosts the WindowManager. This happens if
-  // this WindowTree serves as the root of a WindowTreeHost.
+  // Called if this WindowTree hosts a WindowManager.
   void ConfigureWindowManager();
 
   ClientSpecificId id() const { return id_; }
 
   const UserId& user_id() const { return user_id_; }
 
   mojom::WindowTreeClient* client() { return binding_->client(); }
 
   // Returns the Window with the specified id.
   ServerWindow* GetWindow(const WindowId& id) {
@@ skipping 28 matching lines @@
   const std::string& name() const { return name_; }
 
   bool janky() const { return janky_; }
 
   const Display* GetDisplay(const ServerWindow* window) const;
   Display* GetDisplay(const ServerWindow* window) {
     return const_cast<Display*>(
         const_cast<const WindowTree*>(this)->GetDisplay(window));
   }
 
-  const WindowManagerState* GetWindowManagerState(
+  const WindowManagerDisplayRoot* GetWindowManagerDisplayRoot(
       const ServerWindow* window) const;
-  WindowManagerState* GetWindowManagerState(const ServerWindow* window) {
-    return const_cast<WindowManagerState*>(
-        const_cast<const WindowTree*>(this)->GetWindowManagerState(window));
+  WindowManagerDisplayRoot* GetWindowManagerDisplayRoot(
+      const ServerWindow* window) {
+    return const_cast<WindowManagerDisplayRoot*>(
+        const_cast<const WindowTree*>(this)->GetWindowManagerDisplayRoot(
+            window));
   }
-  GlobalWindowManagerState* global_window_manager_state() {
-    return global_window_manager_state_.get();
+  WindowManagerState* window_manager_state() {
+    return window_manager_state_.get();
   }
 
   DisplayManager* display_manager();
   const DisplayManager* display_manager() const;
 
+  WindowServer* window_server() { return window_server_; }
+  const WindowServer* window_server() const { return window_server_; }
+
   // Adds a new root to this tree. This is only valid for window managers.
   void AddRootForWindowManager(const ServerWindow* root);
 
   // Invoked when a tree is about to be destroyed.
   void OnWindowDestroyingTreeImpl(WindowTree* tree);
 
   // These functions are synchronous variants of those defined in the mojom. The
   // WindowTree implementations all call into these. See the mojom for details.
   bool SetCapture(const ClientWindowId& client_window_id);
   bool NewWindow(const ClientWindowId& client_window_id,
@@ skipping 96 matching lines @@
   };
 
   enum class RemoveRootReason {
     // The window is being removed.
     DELETED,
 
     // Another client is being embedded in the window.
     EMBED,
   };
 
-  // Used when this tree is the window manager.
-  WindowManagerState* GetWindowManagerStateForWindowManager();
-
   bool ShouldRouteToWindowManager(const ServerWindow* window) const;
 
   ClientWindowId ClientWindowIdForWindow(const ServerWindow* window) const;
 
   // Returns true if |id| is a valid WindowId for a new window.
   bool IsValidIdForNewWindow(const ClientWindowId& id) const;
 
   WindowId GenerateNewWindowId();
 
   // These functions return true if the corresponding mojom function is allowed
@@ skipping 198 matching lines @@
   uint32_t event_observer_id_ = 0;
 
   // WindowManager the current event came from.
   WindowManagerState* event_source_wms_ = nullptr;
 
   std::queue<std::unique_ptr<TargetedEvent>> event_queue_;
 
   std::unique_ptr<mojo::AssociatedBinding<mojom::WindowManagerClient>>
       window_manager_internal_client_binding_;
   mojom::WindowManager* window_manager_internal_;
-  std::unique_ptr<GlobalWindowManagerState> global_window_manager_state_;
+  std::unique_ptr<WindowManagerState> window_manager_state_;
 
   std::unique_ptr<WaitingForTopLevelWindowInfo>
       waiting_for_top_level_window_info_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTree);
 };
 
 }  // namespace ws
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_WINDOW_TREE_H_