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

Unified Diff: ash/drag_drop/drag_drop_controller.cc

Issue 9463003: aura-x11: Add custom web cursor support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 9 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 | « no previous file | ash/shell.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 55100811d4fad967c2e067b99145b99e75999df1..dd52f8214b8a6c3e177b9cb9350b956ed2fb1b6d 100644
--- a/ash/drag_drop/drag_drop_controller.cc
+++ b/ash/drag_drop/drag_drop_controller.cc
@@ -114,7 +114,7 @@ void DragDropController::DragUpdate(aura::Window* target,
drag_operation_);
int op = delegate->OnDragUpdated(e);
gfx::NativeCursor cursor = (op == ui::DragDropTypes::DRAG_NONE)?
- aura::kCursorMove : aura::kCursorHand;
+ ui::kCursorMove : ui::kCursorHand;
Shell::GetRootWindow()->SetCursor(cursor);
}
}
@@ -128,7 +128,7 @@ void DragDropController::DragUpdate(aura::Window* target,
void DragDropController::Drop(aura::Window* target,
const aura::LocatedEvent& event) {
- Shell::GetRootWindow()->SetCursor(aura::kCursorPointer);
+ Shell::GetRootWindow()->SetCursor(ui::kCursorPointer);
aura::client::DragDropDelegate* delegate = NULL;
// |drag_window_| can be NULL if we have just started the drag and have not
@@ -153,7 +153,7 @@ void DragDropController::Drop(aura::Window* target,
}
void DragDropController::DragCancel() {
- Shell::GetRootWindow()->SetCursor(aura::kCursorPointer);
+ Shell::GetRootWindow()->SetCursor(ui::kCursorPointer);
aura::client::DragDropDelegate* delegate = NULL;
if ((delegate = aura::client::GetDragDropDelegate(drag_window_))) {
delegate->OnDragExited();
« no previous file with comments | « no previous file | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698