Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1427)

Unified Diff: services/ui/ws/drag_controller.cc

Issue 2378883002: mus ws: Consistently use mojom::Cursor instead of int32_t. (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « services/ui/ws/drag_controller.h ('k') | services/ui/ws/event_dispatcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/drag_controller.cc
diff --git a/services/ui/ws/drag_controller.cc b/services/ui/ws/drag_controller.cc
index 2158fe99f5c9967531fa2fcef821f3006b642f86..3e63b4e67fe7573f8a780ea84f9967b948695aee 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_(static_cast<int32_t>(ui::mojom::Cursor::NO_DROP)),
+ current_cursor_(ui::mojom::Cursor::NO_DROP),
source_window_(source_window),
source_connection_(source_connection),
mime_data_(std::move(mime_data)),
@@ -173,11 +173,12 @@ void DragController::SetWindowDropOperations(ServerWindow* window,
}
}
-int32_t DragController::CursorForEffectBitmask(DropEffectBitmask bitmask) {
+ui::mojom::Cursor DragController::CursorForEffectBitmask(
+ DropEffectBitmask bitmask) {
DropEffectBitmask combined = bitmask & drag_operations_;
return combined == ui::mojom::kDropEffectNone
- ? static_cast<int32_t>(ui::mojom::Cursor::NO_DROP)
- : static_cast<int32_t>(ui::mojom::Cursor::COPY);
+ ? ui::mojom::Cursor::NO_DROP
+ : ui::mojom::Cursor::COPY;
}
void DragController::SetCurrentTargetWindow(ServerWindow* current_target) {
@@ -190,7 +191,7 @@ void DragController::SetCurrentTargetWindow(ServerWindow* current_target) {
current_cursor_ = CursorForEffectBitmask(state.bitmask);
} else {
// Can't drop in empty areas.
- current_cursor_ = static_cast<int32_t>(ui::mojom::Cursor::NO_DROP);
+ current_cursor_ = ui::mojom::Cursor::NO_DROP;
}
cursor_updater_->OnDragCursorUpdated();
« no previous file with comments | « services/ui/ws/drag_controller.h ('k') | services/ui/ws/event_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698