Use dropEffect move now that it works.

BUG=38591
TEST=Drag bookmarks inside the bookmark manager. The move cursor should be shown.
     Rearrange thumbnails on the new tab page using DnD. The move icon should be used.

Review URL: http://codereview.chromium.org/1563003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43114 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 7 deletions

diff --git a/chrome/browser/resources/bookmark_manager/main.html b/chrome/browser/resources/bookmark_manager/main.html
index 29df486..230fd97 100644
--- a/chrome/browser/resources/bookmark_manager/main.html
+++ b/chrome/browser/resources/bookmark_manager/main.html
@@ -393,9 +393,6 @@ tree.buildTree();
 addBookmarkModelListeners();
 
 var dnd = {
-  DND_EFFECT_COPY: 'copy',
-  DND_EFFECT_MOVE: cr.isMac ? 'move' : 'copy', // http://crbug.com/14654
-
   dragData: null,
 
   getBookmarkElement: function(el) {
@@ -703,8 +700,7 @@ var dnd = {
 
     var dropPos;
 
-    e.dataTransfer.dropEffect = this.dragData.sameProfile ?
-        this.DND_EFFECT_MOVE : this.DND_EFFECT_COPY;
+    e.dataTransfer.dropEffect = this.dragData.sameProfile ? 'move' : 'copy';
 
     var rect;
     if (overElement instanceof TreeItem) {
diff --git a/chrome/browser/resources/new_new_tab.js b/chrome/browser/resources/new_new_tab.js
index a41f830..9932cf2 100644
--- a/chrome/browser/resources/new_new_tab.js
+++ b/chrome/browser/resources/new_new_tab.js
@@ -1397,7 +1397,7 @@ var dnd = {
       this.dragItem = thumbnail;
       addClass(this.dragItem, 'dragging');
       this.dragItem.style.zIndex = 2;
-      e.dataTransfer.effectAllowed = this.DND_EFFECT;
+      e.dataTransfer.effectAllowed = 'copyLinkMove';
     }
   },
 
@@ -1412,7 +1412,7 @@ var dnd = {
     this.currentOverItem = item;
     if (this.canDropOnElement(item)) {
       e.preventDefault();
-      e.dataTransfer.dropEffect = this.DND_EFFECT;
+      e.dataTransfer.dropEffect = 'move';
     }
   },