[views-mus] Support custom cursors.

ui/aura/mus/window_tree_client.h

Index: ui/aura/mus/window_tree_client.h
diff --git a/ui/aura/mus/window_tree_client.h b/ui/aura/mus/window_tree_client.h
index 57616e9ffde0f540d0d3195865d1e76adc6dabca..0e5a550b01f078e7ecbca88c8dec40b392aa9bc3 100644
--- a/ui/aura/mus/window_tree_client.h
+++ b/ui/aura/mus/window_tree_client.h
@@ -130,9 +130,9 @@ class AURA_EXPORT WindowTreeClient
   void SetCanAcceptDrops(WindowMus* window, bool can_accept_drops);
   void SetEventTargetingPolicy(WindowMus* window,
                                ui::mojom::EventTargetingPolicy policy);
-  void SetPredefinedCursor(WindowMus* window,
-                           ui::mojom::CursorType old_cursor,
-                           ui::mojom::CursorType new_cursor);
+  void SetCursor(WindowMus* window,
+                 const ui::CursorData& old_cursor,
+                 const ui::CursorData& new_cursor);
   void SetWindowTextInputState(WindowMus* window,
                                mojo::TextInputStatePtr state);
   void SetImeVisibility(WindowMus* window,
@@ -384,8 +384,7 @@ class AURA_EXPORT WindowTreeClient
                               uint32_t window_id,
                               int64_t display_id) override;
   void OnWindowFocused(Id focused_window_id) override;
-  void OnWindowPredefinedCursorChanged(Id window_id,
-                                       ui::mojom::CursorType cursor) override;
+  void OnWindowCursorChanged(Id window_id, ui::CursorData cursor) override;
   void OnWindowSurfaceChanged(Id window_id,
                               const cc::SurfaceInfo& surface_info) override;
   void OnDragDropStart(
@@ -466,7 +465,7 @@ class AURA_EXPORT WindowTreeClient
   void SetFrameDecorationValues(
       ui::mojom::FrameDecorationValuesPtr values) override;
   void SetNonClientCursor(Window* window,
-                          ui::mojom::CursorType cursor_id) override;
+                          const ui::CursorData& cursor) override;
   void AddAccelerators(std::vector<ui::mojom::WmAcceleratorPtr> accelerators,
                        const base::Callback<void(bool)>& callback) override;
   void RemoveAccelerator(uint32_t id) override;