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

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

Issue 2504743002: Linux Aura: Fixes and improvements for cursor loader (Closed)
Patch Set: Created 4 years, 1 month 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 72880d18b1bbda42ec412f756b28d1db2d08ed0f..91958322a6a8a19321cc5e27d1c320e0e333e9c7 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
@@ -681,15 +681,20 @@ void DesktopDragDropClientAuraX11::OnXdndStatus(
int cursor_type = ui::kCursorNull;
switch (negotiated_operation_) {
- case ui::DragDropTypes::DRAG_COPY:
- cursor_type = ui::kCursorCopy;
+ case ui::DragDropTypes::DRAG_NONE:
+ cursor_type = ui::kCursorDndNone;
break;
case ui::DragDropTypes::DRAG_MOVE:
- cursor_type = ui::kCursorMove;
+ cursor_type = ui::kCursorDndMove;
+ break;
+ case ui::DragDropTypes::DRAG_COPY:
+ cursor_type = ui::kCursorDndCopy;
+ break;
+ case ui::DragDropTypes::DRAG_LINK:
+ cursor_type = ui::kCursorDndLink;
break;
default:
sadrul 2016/11/17 16:17:03 Remove the default:
Tom (Use chromium acct) 2016/11/17 19:17:48 Done.
- cursor_type = ui::kCursorGrabbing;
- break;
+ NOTREACHED();
}
move_loop_->UpdateCursor(cursor_manager_->GetInitializedCursor(cursor_type));

Powered by Google App Engine
This is Rietveld 408576698