Add bookmark copying while dragging by holding down the <option> key.

BUG=35969
TEST=Hold down the <option> key while dragging a bookmark to a new location. Repeat with the following: 1) From bookmark bar to bookmark bar, 2) from bookmark bar into a folder, 3) from within a folder to a different place within the same folder, 4) from within a folder to the bookmark bar, 5) from within a folder to a different folder. Check to insure that the original bookmark (and its contents if it was a folder) are in both the original location and the new location.

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

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

1 files changed, 5 insertions, 1 deletions

diff --git a/chrome/browser/cocoa/bookmark_bar_view.mm b/chrome/browser/cocoa/bookmark_bar_view.mm
index b1099b2..9e47614 100644
--- a/chrome/browser/cocoa/bookmark_bar_view.mm
+++ b/chrome/browser/cocoa/bookmark_bar_view.mm
@@ -220,7 +220,11 @@
   if (data && [info draggingSource]) {
     BookmarkButton* button = nil;
     [data getBytes:&button length:sizeof(button)];
-    rtn = [controller_ dragButton:button to:[info draggingLocation]];
+    BOOL copy =
+      [info draggingSourceOperationMask] & NSDragOperationMove ? NO : YES;
+    rtn = [controller_ dragButton:button
+                               to:[info draggingLocation]
+                             copy:copy];
   }
   return rtn;
 }