Split cursor location from UserDisplayManager.

services/ui/ws/display_manager.h

 // Copyright 2016 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 SERVICES_UI_WS_DISPLAY_MANAGER_H_
 #define SERVICES_UI_WS_DISPLAY_MANAGER_H_
 
 #include <map>
 #include <memory>
 #include <set>
 
 #include "base/macros.h"
 #include "services/ui/display/screen_manager_delegate.h"
+#include "services/ui/ws/cursor_location_manager.h"

[msw, 2017/02/16 21:19:49]

nit: use a fwd decl instead

[kylechar, 2017/02/16 22:06:56]

Done.

 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/user_id.h"
 #include "services/ui/ws/user_id_tracker_observer.h"
 
 namespace ui {
 namespace ws {
 
 class Display;
 class ServerWindow;
 class UserDisplayManager;
 class UserIdTracker;
 class WindowManagerDisplayRoot;
 class WindowServer;
 
 // DisplayManager manages the set of Displays. DisplayManager distinguishes
 // between displays that do yet have an accelerated widget (pending), vs
 // those that do.
 class DisplayManager : public UserIdTrackerObserver,
                        public display::ScreenManagerDelegate {
  public:
   DisplayManager(WindowServer* window_server, UserIdTracker* user_id_tracker);
   ~DisplayManager() override;
 
   // Returns the UserDisplayManager for |user_id|. DisplayManager owns the
   // return value.
   UserDisplayManager* GetUserDisplayManager(const UserId& user_id);
 
+  // Returns the CursorLocationManager for |user_id|.
+  CursorLocationManager* GetCursorLocationManager(const UserId& user_id);
+
   // Adds/removes a Display. DisplayManager owns the Displays.
   // TODO(sky): make add take a scoped_ptr.
   void AddDisplay(Display* display);
   void DestroyDisplay(Display* display);
   void DestroyAllDisplays();
   const std::set<Display*>& displays() { return displays_; }
   std::set<const Display*> displays() const;
 
   // Notifies when something about the Display changes.
   void OnDisplayUpdate(Display* display);
@@ skipping 41 matching lines @@
   WindowServer* window_server_;
   UserIdTracker* user_id_tracker_;
 
   // Displays are initially added to |pending_displays_|. When the display is
   // initialized it is moved to |displays_|. WindowServer owns the Displays.
   std::set<Display*> pending_displays_;
   std::set<Display*> displays_;
 
   std::map<UserId, std::unique_ptr<UserDisplayManager>> user_display_managers_;
 
+  std::map<UserId, std::unique_ptr<CursorLocationManager>>
+      cursor_location_managers_;
+
   // ID to use for next root node.
   ClientSpecificId next_root_id_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayManager);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_DISPLAY_MANAGER_H_