Split cursor location from UserDisplayManager.

services/ui/ws/display_manager.h

Index: services/ui/ws/display_manager.h
diff --git a/services/ui/ws/display_manager.h b/services/ui/ws/display_manager.h
index 00eeebb10f82c6f18c8948b26ee3390b38aded7a..6096ccb7ac7091d92d686b3d48f15600b193ee19 100644
--- a/services/ui/ws/display_manager.h
+++ b/services/ui/ws/display_manager.h
@@ -11,6 +11,7 @@
 
 #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"
@@ -38,6 +39,9 @@ class DisplayManager : public UserIdTrackerObserver,
   // 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);
@@ -99,6 +103,9 @@ class DisplayManager : public UserIdTrackerObserver,
 
   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_;