diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-08 05:55:07 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-08 05:55:07 +0000 |
commit | 0724e82343ab19fca8afe92c57f0bd78df1fa567 (patch) | |
tree | e6ddfc1207ede93faf6c8991071ae8b93944a05f /ash/drag_drop | |
parent | 47b375e2cabf0d953a4a342e7c51abc9a5afc926 (diff) | |
download | chromium_src-0724e82343ab19fca8afe92c57f0bd78df1fa567.zip chromium_src-0724e82343ab19fca8afe92c57f0bd78df1fa567.tar.gz chromium_src-0724e82343ab19fca8afe92c57f0bd78df1fa567.tar.bz2 |
Revert r135533.
It broke all content_unittests on mac in debug builds.
BUG=121135,126558
TEST=no stack dumps in content_unittests output on mac debug builds
TBR=varunjain
Review URL: https://chromiumcodereview.appspot.com/10386020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135796 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop')
-rw-r--r-- | ash/drag_drop/drag_drop_controller.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc index b06beed67..09e0aad 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)? - ui::kCursorNoDrop : ui::kCursorCopy; + ui::kCursorMove : ui::kCursorHand; Shell::GetRootWindow()->SetCursor(cursor); } } |