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

Unified Diff: ash/drag_drop/drag_drop_controller.cc

Issue 2833163002: Change ui cursor identifiers to an enum class. (Closed)
Patch Set: OK, it can't be explicit for mac. 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
« no previous file with comments | « ash/display/mirror_window_controller_unittest.cc ('k') | ash/extended_desktop_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/drag_drop/drag_drop_controller.cc
diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc
index 5a5643002f63f0516c092905dbb1d4e3f26a0be3..01484baa33e72c5270c69e484d9b6dfc4b1fc074 100644
--- a/ash/drag_drop/drag_drop_controller.cc
+++ b/ash/drag_drop/drag_drop_controller.cc
@@ -436,13 +436,13 @@ void DragDropController::DragUpdate(aura::Window* target,
e.set_root_location_f(event.root_location_f());
e.set_flags(event.flags());
op = delegate->OnDragUpdated(e);
- gfx::NativeCursor cursor = ui::kCursorNoDrop;
+ gfx::NativeCursor cursor = ui::CursorType::kNoDrop;
if (op & ui::DragDropTypes::DRAG_COPY)
- cursor = ui::kCursorCopy;
+ cursor = ui::CursorType::kCopy;
else if (op & ui::DragDropTypes::DRAG_LINK)
- cursor = ui::kCursorAlias;
+ cursor = ui::CursorType::kAlias;
else if (op & ui::DragDropTypes::DRAG_MOVE)
- cursor = ui::kCursorGrabbing;
+ cursor = ui::CursorType::kGrabbing;
ash::Shell::Get()->cursor_manager()->SetCursor(cursor);
}
}
@@ -460,7 +460,7 @@ void DragDropController::DragUpdate(aura::Window* target,
void DragDropController::Drop(aura::Window* target,
const ui::LocatedEvent& event) {
- ash::Shell::Get()->cursor_manager()->SetCursor(ui::kCursorPointer);
+ ash::Shell::Get()->cursor_manager()->SetCursor(ui::CursorType::kPointer);
// We must guarantee that a target gets a OnDragEntered before Drop. WebKit
// depends on not getting a Drop without DragEnter. This behavior is
@@ -515,7 +515,7 @@ void DragDropController::AnimationEnded(const gfx::Animation* animation) {
}
void DragDropController::DoDragCancel(int drag_cancel_animation_duration_ms) {
- ash::Shell::Get()->cursor_manager()->SetCursor(ui::kCursorPointer);
+ ash::Shell::Get()->cursor_manager()->SetCursor(ui::CursorType::kPointer);
// |drag_window_| can be NULL if we have just started the drag and have not
// received any DragUpdates, or, if the |drag_window_| gets destroyed during
« no previous file with comments | « ash/display/mirror_window_controller_unittest.cc ('k') | ash/extended_desktop_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698