[views-mus] Support custom cursors.

services/ui/ws/window_server.h

Index: services/ui/ws/window_server.h
diff --git a/services/ui/ws/window_server.h b/services/ui/ws/window_server.h
index d01c2e0091317d2cf1e9c36bf106632f72b57317..f79cf963966e600304070af38dffa3e166c6339e 100644
--- a/services/ui/ws/window_server.h
+++ b/services/ui/ws/window_server.h
@@ -188,8 +188,8 @@ class WindowServer : public ServerWindowDelegate,
                             const ServerWindow* relative_window,
                             const mojom::OrderDirection direction);
   void ProcessWindowDeleted(ServerWindow* window);
-  void ProcessWillChangeWindowPredefinedCursor(ServerWindow* window,
-                                               mojom::CursorType cursor_id);
+  void ProcessWillChangeWindowCursor(ServerWindow* window,
+                                     const ui::CursorData& cursor);
 
   // Sends an |event| to all WindowTrees belonging to |user_id| that might be
   // observing events. Skips |ignore_tree| if it is non-null. |target_window| is
@@ -322,10 +322,10 @@ class WindowServer : public ServerWindowDelegate,
       ServerWindow* window,
       const std::string& name,
       const std::vector<uint8_t>* new_data) override;
-  void OnWindowPredefinedCursorChanged(ServerWindow* window,
-                                       mojom::CursorType cursor_id) override;
+  void OnWindowCursorChanged(ServerWindow* window,
+                             const ui::CursorData& cursor) override;
   void OnWindowNonClientCursorChanged(ServerWindow* window,
-                                      mojom::CursorType cursor_id) override;
+                                      const ui::CursorData& cursor) override;
   void OnWindowTextInputStateChanged(ServerWindow* window,
                                      const ui::TextInputState& state) override;
   void OnTransientWindowAdded(ServerWindow* window,