| 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..bfb243ebbad7bb456fc35bc124c509d29add5dda 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::NO_DROP;
|
| if (op & ui::DragDropTypes::DRAG_COPY)
|
| - cursor = ui::kCursorCopy;
|
| + cursor = ui::CursorType::COPY;
|
| else if (op & ui::DragDropTypes::DRAG_LINK)
|
| - cursor = ui::kCursorAlias;
|
| + cursor = ui::CursorType::ALIAS;
|
| else if (op & ui::DragDropTypes::DRAG_MOVE)
|
| - cursor = ui::kCursorGrabbing;
|
| + cursor = ui::CursorType::GRABBING;
|
| 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::POINTER);
|
|
|
| // 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::POINTER);
|
|
|
| // |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
|
|
|