[views-mus] Support custom cursors.

services/ui/ws/drag_controller.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/ui/ws/drag_controller.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "services/ui/public/interfaces/cursor/cursor.mojom.h"
 #include "services/ui/ws/drag_cursor_updater.h"
 #include "services/ui/ws/drag_source.h"
 #include "services/ui/ws/drag_target_connection.h"
 #include "services/ui/ws/event_dispatcher.h"
 #include "services/ui/ws/server_window.h"
+#include "ui/base/cursor/cursor.h"
 
 namespace ui {
 namespace ws {
 
 struct DragController::Operation {
   OperationType type;
   uint32_t event_flags;
   gfx::Point screen_position;
 };
 
@@ skipping 19 matching lines @@
     DragSource* source,
     ServerWindow* source_window,
     DragTargetConnection* source_connection,
     int32_t drag_pointer,
     const std::unordered_map<std::string, std::vector<uint8_t>>& mime_data,
     DropEffectBitmask drag_operations)
     : source_(source),
       cursor_updater_(cursor_updater),
       drag_operations_(drag_operations),
       drag_pointer_id_(drag_pointer),
-      current_cursor_(ui::mojom::CursorType::kNoDrop),
+      current_cursor_(ui::CursorType::kNoDrop),
       source_window_(source_window),
       source_connection_(source_connection),
       mime_data_(mime_data),
       weak_factory_(this) {
   SetCurrentTargetWindow(nullptr);
   EnsureWindowObserved(source_window_);
 }
 
 DragController::~DragController() {
   for (auto& pair : window_state_) {
@@ skipping 114 matching lines @@
                                              DropEffectBitmask bitmask) {
   WindowState& state = window_state_[window];
   state.bitmask = bitmask;
 
   if (current_target_window_ == window) {
     current_cursor_ = CursorForEffectBitmask(bitmask);
     cursor_updater_->OnDragCursorUpdated();
   }
 }
 
-ui::mojom::CursorType DragController::CursorForEffectBitmask(
+ui::CursorData DragController::CursorForEffectBitmask(
     DropEffectBitmask bitmask) {
   DropEffectBitmask combined = bitmask & drag_operations_;
-  return combined == ui::mojom::kDropEffectNone ? ui::mojom::CursorType::kNoDrop
-                                                : ui::mojom::CursorType::kCopy;
+  return combined == ui::mojom::kDropEffectNone
+             ? ui::CursorData(ui::CursorType::kNoDrop)
+             : ui::CursorData(ui::CursorType::kCopy);
 }
 
 void DragController::SetCurrentTargetWindow(ServerWindow* current_target) {
   current_target_window_ = current_target;
 
   if (current_target_window_) {
     // Immediately set the cursor to the last known set of operations (which
     // could be none).
     WindowState& state = window_state_[current_target_window_];
     current_cursor_ = CursorForEffectBitmask(state.bitmask);
   } else {
     // Can't drop in empty areas.
-    current_cursor_ = ui::mojom::CursorType::kNoDrop;
+    current_cursor_ = ui::CursorData(ui::CursorType::kNoDrop);
   }
 
   cursor_updater_->OnDragCursorUpdated();
 }
 
 void DragController::EnsureWindowObserved(ServerWindow* window) {
   if (!window)
     return;
 
   WindowState& state = window_state_[window];
@@ skipping 139 matching lines @@
       return "LEAVE";
     case OperationType::DROP:
       return "DROP";
   }
   NOTREACHED();
   return std::string();
 }
 
 }  // namespace ws
 }  // namespace ui