diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-03 21:14:36 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-03 21:14:36 +0000 |
| commit | c78395583ae96c6ad4287cc1af8ec2ba1cd038c8 (patch) | |
| tree | 7d3190a78c9c6b243ab5ea6a1c12090835edc3f4 /ash/drag_drop | |
| parent | 741a46a76bd8f09547a3ea8967f380ccde31ae65 (diff) | |
| download | chromium_src-c78395583ae96c6ad4287cc1af8ec2ba1cd038c8.zip chromium_src-c78395583ae96c6ad4287cc1af8ec2ba1cd038c8.tar.gz chromium_src-c78395583ae96c6ad4287cc1af8ec2ba1cd038c8.tar.bz2 | |
aura-x11: Add custom web cursor support.
BUG=102562
TEST=manually (using sites that use custom cursor, e.g.: http://beradrian.users.sourceforge.net/articles/cursor.html)
Review URL: https://chromiumcodereview.appspot.com/9463003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130456 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc index 5510081..dd52f82 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(); |