[views-mus] Support custom cursors.

services/ui/ws/drag_controller.h

Index: services/ui/ws/drag_controller.h
diff --git a/services/ui/ws/drag_controller.h b/services/ui/ws/drag_controller.h
index de8ea9af7337bda5258f8a6c29de4c9767e6629f..33748221342310f8bc5a01b51d93a87e7f024962 100644
--- a/services/ui/ws/drag_controller.h
+++ b/services/ui/ws/drag_controller.h
@@ -53,7 +53,7 @@ class DragController : public ServerWindowObserver {
       DropEffectBitmask drag_operations);
   ~DragController() override;
 
-  ui::mojom::CursorType current_cursor() const { return current_cursor_; }
+  ui::CursorData current_cursor() const { return current_cursor_; }

[sky, 2017/04/26 22:16:15]

const ui::CursorData& ?

[Elliot Glaysher, 2017/04/26 23:09:04]

Done.

 
   // Cancels the current drag, ie, due to the user pressing Escape.
   void Cancel();
@@ -89,9 +89,9 @@ class DragController : public ServerWindowObserver {
   // bitmask of the current valid drag operations.
   void SetWindowDropOperations(ServerWindow* window, DropEffectBitmask bitmask);
 
-  // Returns the ui::mojom::Cursor for the window |bitmask|, adjusted for types
-  // that the drag source allows.
-  ui::mojom::CursorType CursorForEffectBitmask(DropEffectBitmask bitmask);
+  // Returns the cursor for the window |bitmask|, adjusted for types that the
+  // drag source allows.
+  ui::CursorData CursorForEffectBitmask(DropEffectBitmask bitmask);
 
   // Ensure that |window| has an entry in |window_state_| and that we're an
   // observer.
@@ -126,7 +126,7 @@ class DragController : public ServerWindowObserver {
   const int32_t drag_pointer_id_;
 
   // The current mouse cursor during the drag.
-  ui::mojom::CursorType current_cursor_;
+  ui::CursorData current_cursor_;
 
   // Sending OnDragOver() to our |source_| destroys us; there is a period where
   // we have to continue to exist, but not process any more pointer events.