mus: Rename mojom::Cursor to mojom::CursorType.

services/ui/ws/server_window.h

Index: services/ui/ws/server_window.h
diff --git a/services/ui/ws/server_window.h b/services/ui/ws/server_window.h
index c94a52cd6fdda4b8f9061894d8ef564ca26c7342..e98f70368d8629d029fa2ce7d88b0cab6507a7ed 100644
--- a/services/ui/ws/server_window.h
+++ b/services/ui/ws/server_window.h
@@ -105,8 +105,8 @@ class ServerWindow {
   bool can_accept_drops() const { return accepts_drops_; }
   void SetCanAcceptDrops(bool accepts_drags);
 
-  ui::mojom::Cursor cursor() const { return cursor_id_; }
-  ui::mojom::Cursor non_client_cursor() const {
+  ui::mojom::CursorType cursor() const { return cursor_id_; }
+  ui::mojom::CursorType non_client_cursor() const {
     return non_client_cursor_id_;
   }
 
@@ -151,8 +151,8 @@ class ServerWindow {
   float opacity() const { return opacity_; }
   void SetOpacity(float value);
 
-  void SetPredefinedCursor(ui::mojom::Cursor cursor_id);
-  void SetNonClientCursor(ui::mojom::Cursor cursor_id);
+  void SetPredefinedCursor(ui::mojom::CursorType cursor_id);
+  void SetNonClientCursor(ui::mojom::CursorType cursor_id);
 
   const gfx::Transform& transform() const { return transform_; }
   void SetTransform(const gfx::Transform& transform);
@@ -252,8 +252,8 @@ class ServerWindow {
   std::vector<gfx::Rect> additional_client_areas_;
   std::unique_ptr<ServerWindowCompositorFrameSinkManager>
       compositor_frame_sink_manager_;
-  mojom::Cursor cursor_id_;
-  mojom::Cursor non_client_cursor_id_;
+  mojom::CursorType cursor_id_;
+  mojom::CursorType non_client_cursor_id_;
   float opacity_;
   bool can_focus_;
   mojom::EventTargetingPolicy event_targeting_policy_ =