Index: services/ui/ws/drag_controller.cc |
diff --git a/services/ui/ws/drag_controller.cc b/services/ui/ws/drag_controller.cc |
index d5bce60facc3b449cd5aa5e27efd30ecf0bf8605..cc3b99925ec38d48ed385b7afb8bf6de913821d1 100644 |
--- a/services/ui/ws/drag_controller.cc |
+++ b/services/ui/ws/drag_controller.cc |
@@ -13,6 +13,7 @@ |
#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 { |
@@ -52,7 +53,7 @@ DragController::DragController( |
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), |
@@ -187,11 +188,12 @@ void DragController::SetWindowDropOperations(ServerWindow* window, |
} |
} |
-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) { |
@@ -204,7 +206,7 @@ void DragController::SetCurrentTargetWindow(ServerWindow* current_target) { |
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(); |