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

Unified Diff: ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc

Issue 2833163002: Change ui cursor identifiers to an enum class. (Closed)
Patch Set: Remove extranious ::ui:: Created 3 years, 8 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
Index: ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc
diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc
index 1a8a4aa1f21ef3c537fec7843e3cc0613e848689..15c30d356d5f0adda3f19522be3b9f07a884147c 100644
--- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc
+++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc
@@ -680,19 +680,19 @@ void DesktopDragDropClientAuraX11::OnXdndStatus(
return;
}
- int cursor_type = ui::kCursorNull;
+ ui::CursorType cursor_type = ui::CursorType::CURSOR_NULL;
switch (negotiated_operation_) {
case ui::DragDropTypes::DRAG_NONE:
- cursor_type = ui::kCursorDndNone;
+ cursor_type = ui::CursorType::DND_NONE;
break;
case ui::DragDropTypes::DRAG_MOVE:
- cursor_type = ui::kCursorDndMove;
+ cursor_type = ui::CursorType::DND_MOVE;
break;
case ui::DragDropTypes::DRAG_COPY:
- cursor_type = ui::kCursorDndCopy;
+ cursor_type = ui::CursorType::DND_COPY;
break;
case ui::DragDropTypes::DRAG_LINK:
- cursor_type = ui::kCursorDndLink;
+ cursor_type = ui::CursorType::DND_LINK;
break;
}
move_loop_->UpdateCursor(cursor_manager_->GetInitializedCursor(cursor_type));
@@ -849,9 +849,8 @@ int DesktopDragDropClientAuraX11::StartDragAndDrop(
// Windows has a specific method, DoDragDrop(), which performs the entire
// drag. We have to emulate this, so we spin off a nested runloop which will
// track all cursor movement and reroute events to a specific handler.
- move_loop_->RunMoveLoop(
- source_window,
- cursor_manager_->GetInitializedCursor(ui::kCursorGrabbing));
+ move_loop_->RunMoveLoop(source_window, cursor_manager_->GetInitializedCursor(
+ ui::CursorType::GRABBING));
if (alive) {
if (negotiated_operation_ == ui::DragDropTypes::DRAG_NONE) {

Powered by Google App Engine
This is Rietveld 408576698