mac: Fix bookmark drag and drop.

chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.mm

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
 
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_node_data.h"
 #include "components/bookmarks/browser/bookmark_pasteboard_helper_mac.h"
 #include "ui/base/clipboard/clipboard_util_mac.h"
 #import "ui/base/cocoa/cocoa_base_utils.h"
 
 using bookmarks::BookmarkNode;
 using bookmarks::BookmarkNodeData;
 
 NSString* kBookmarkButtonDragType = @"com.google.chrome.BookmarkButtonDrag";
 
-@interface BookmarkFolderTarget()
-// Copies the given bookmark node to the given pasteboard, declaring appropriate
-// types (to paste a URL with a title).
-- (void)copyBookmarkNode:(const BookmarkNode*)node
-        toDragPasteboard:(NSPasteboard*)pboard;
-@end
-
 @implementation BookmarkFolderTarget
 
 - (id)initWithController:(id<BookmarkButtonControllerProtocol>)controller
                  profile:(Profile*)profile {
   if ((self = [super init])) {
     controller_ = controller;
     profile_ = profile;
   }
   return self;
 }
@@ skipping 44 matching lines @@
   // If click on same folder, close it and be done.
   // Else we clicked on a different folder so more work to do.
   if ([[controller_ folderController] parentButton] == sender) {
     [controller_ closeBookmarkFolder:controller_];
     return;
   }
 
   [controller_ addNewFolderControllerWithParentButton:sender];
 }
 
-- (void)copyBookmarkNode:(const BookmarkNode*)node
-        toDragPasteboard:(NSPasteboard*)pboard {
-  if (!node) {
-    NOTREACHED();
-    return;
-  }
+- (NSPasteboardItem*)pasteboardItemForDragOfButton:(BookmarkButton*)button {
+  const BookmarkNode* node = [button bookmarkNode];
+  DCHECK(node);
 
+  NSPasteboardItem* item = nil;
   if (node->is_folder()) {
     // TODO(viettrungluu): I'm not sure what we should do, so just declare the
     // "additional" types we're given for now. Maybe we want to add a list of
     // URLs? Would we then have to recurse if there were subfolders?
-    // In the meanwhile, we *must* set it to a known state.
-    [pboard clearContents];
+    item = [[[NSPasteboardItem alloc] init] autorelease];
   } else {
     BookmarkNodeData data(node);
     data.SetOriginatingProfilePath(profile_->GetPath());
-    data.WriteToClipboard(ui::CLIPBOARD_TYPE_DRAG);
+    item = PasteboardItemFromBookmarks(data.elements, profile_->GetPath());
   }
-}
 
-- (void)fillPasteboard:(NSPasteboard*)pboard
-       forDragOfButton:(BookmarkButton*)button {
-  if (const BookmarkNode* node = [button bookmarkNode]) {
-    // Put the bookmark information into the pasteboard, and then write our own
-    // data for
-    // |ui::ClipboardUtil::UTIForPasteboardType(kBookmarkButtonDragType)|.
-    [self copyBookmarkNode:node toDragPasteboard:pboard];
-    [pboard addTypes:@[ ui::ClipboardUtil::UTIForPasteboardType(
-                         kBookmarkButtonDragType) ]
-               owner:nil];
-    [pboard setData:[NSData dataWithBytes:&button length:sizeof(button)]
-            forType:ui::ClipboardUtil::UTIForPasteboardType(
-                        kBookmarkButtonDragType)];
-  } else {
-    NOTREACHED();
-  }
+  [item
+      setData:[NSData dataWithBytes:&button length:sizeof(button)]
+      forType:ui::ClipboardUtil::UTIForPasteboardType(kBookmarkButtonDragType)];
+  return item;
 }
 
 @end