Moves EventDispatcher from Display to 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 91 matching lines @@
   std::set<const ServerWindow*> roots() { return roots_; }
 
   bool is_embed_root() const { return is_embed_root_; }
 
   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 ServerWindow* window) const;
+  WindowManagerState* GetWindowManagerState(const ServerWindow* window) {
+    return const_cast<WindowManagerState*>(
+        const_cast<const WindowTree*>(this)->GetWindowManagerState(window));
+  }
+
   // Invoked when a tree is about to be destroyed.
   void OnWindowDestroyingTreeImpl(WindowTree* tree);
 
-  void OnWillDestroyDisplay(Display* display);
-
   // 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,
                  const std::map<std::string, std::vector<uint8_t>>& properties);
   bool AddWindow(const ClientWindowId& parent_id,
                  const ClientWindowId& child_id);
   bool AddTransientWindow(const ClientWindowId& window_id,
                           const ClientWindowId& transient_window_id);
   std::vector<const ServerWindow*> GetWindowTree(
       const ClientWindowId& window_id) const;
   bool SetWindowVisibility(const ClientWindowId& window_id, bool visible);
   bool Embed(const ClientWindowId& window_id,
@@ skipping 270 matching lines @@
   base::hash_map<WindowId, ServerWindow*> created_window_map_;
 
   // The client is allowed to assign ids. These two maps providing the mapping
   // from the ids native to the server (WindowId) to those understood by the
   // client (ClientWindowId).
   base::hash_map<ClientWindowId, WindowId> client_id_to_window_id_map_;
   base::hash_map<WindowId, ClientWindowId> window_id_to_client_id_map_;
 
   uint32_t event_ack_id_;
 
-  // Display the current event came from.
-  Display* event_source_display_;
+  // WindowManager the current event came from.
+  WindowManagerState* event_source_wms_ = nullptr;
 
   bool is_embed_root_;
 
   std::queue<scoped_ptr<TargetedEvent>> event_queue_;
 
   scoped_ptr<mojo::AssociatedBinding<mojom::WindowManagerClient>>
       window_manager_internal_client_binding_;
   mojom::WindowManager* window_manager_internal_;
 
   scoped_ptr<WaitingForTopLevelWindowInfo> waiting_for_top_level_window_info_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTree);
 };
 
 }  // namespace ws
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_WINDOW_TREE_H_