| Index: services/ui/ws/drag_controller.cc
|
| diff --git a/services/ui/ws/drag_controller.cc b/services/ui/ws/drag_controller.cc
|
| index 45a0eee226d37eae897becfece6eb09c11609fa0..c780fef3d96ea847bac97a4030437971bfba4039 100644
|
| --- a/services/ui/ws/drag_controller.cc
|
| +++ b/services/ui/ws/drag_controller.cc
|
| @@ -52,7 +52,7 @@ DragController::DragController(
|
| cursor_updater_(cursor_updater),
|
| drag_operations_(drag_operations),
|
| drag_pointer_id_(drag_pointer),
|
| - current_cursor_(ui::mojom::Cursor::NO_DROP),
|
| + current_cursor_(ui::mojom::CursorType::NO_DROP),
|
| source_window_(source_window),
|
| source_connection_(source_connection),
|
| mime_data_(mime_data),
|
| @@ -187,12 +187,11 @@ void DragController::SetWindowDropOperations(ServerWindow* window,
|
| }
|
| }
|
|
|
| -ui::mojom::Cursor DragController::CursorForEffectBitmask(
|
| +ui::mojom::CursorType DragController::CursorForEffectBitmask(
|
| DropEffectBitmask bitmask) {
|
| DropEffectBitmask combined = bitmask & drag_operations_;
|
| - return combined == ui::mojom::kDropEffectNone
|
| - ? ui::mojom::Cursor::NO_DROP
|
| - : ui::mojom::Cursor::COPY;
|
| + return combined == ui::mojom::kDropEffectNone ? ui::mojom::CursorType::NO_DROP
|
| + : ui::mojom::CursorType::COPY;
|
| }
|
|
|
| void DragController::SetCurrentTargetWindow(ServerWindow* current_target) {
|
| @@ -205,7 +204,7 @@ void DragController::SetCurrentTargetWindow(ServerWindow* current_target) {
|
| current_cursor_ = CursorForEffectBitmask(state.bitmask);
|
| } else {
|
| // Can't drop in empty areas.
|
| - current_cursor_ = ui::mojom::Cursor::NO_DROP;
|
| + current_cursor_ = ui::mojom::CursorType::NO_DROP;
|
| }
|
|
|
| cursor_updater_->OnDragCursorUpdated();
|
|
|