mac: Fix bookmark drag and drop.

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

 // Copyright (c) 2012 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_button.h"
 
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
@@ skipping 18 matching lines @@
 static const CGFloat kDragImageOpacity = 0.7;
 
 namespace {
 // We need a class variable to track the current dragged button to enable
 // proper live animated dragging behavior, and can't do it in the
 // delegate/controller since you can drag a button from one domain to the
 // other (from a "folder" menu, to the main bar, or vice versa).
 BookmarkButton* gDraggedButton = nil; // Weak
 };
 
-@interface BookmarkButton() <NSPasteboardItemDataProvider>
-
-// NSPasteboardItemDataProvider:
-- (void)pasteboard:(NSPasteboard*)sender
-                  item:(NSPasteboardItem*)item
-    provideDataForType:(NSString*)type;
+@interface BookmarkButton()
 
 // NSDraggingSource:
 - (void)draggingSession:(NSDraggingSession*)session
            endedAtPoint:(NSPoint)aPoint
               operation:(NSDragOperation)operation;
 - (NSDragOperation)draggingSession:(NSDraggingSession*)session
     sourceOperationMaskForDraggingContext:(NSDraggingContext)context;
 
 // Make a drag image for the button.
 - (NSImage*)dragImage;
@@ skipping 139 matching lines @@
   if ([[self delegate] dragShouldLockBarVisibility]) {
     DCHECK(!visibilityDelegate_);
     NSWindow* window = [[self delegate] browserWindow];
     visibilityDelegate_ =
         [BrowserWindowController browserWindowControllerForWindow:window];
     [visibilityDelegate_ lockBarVisibilityForOwner:self
                                      withAnimation:NO
                                              delay:NO];
   }
   const BookmarkNode* node = [self bookmarkNode];
-  const BookmarkNode* parent = node ? node->parent() : NULL;
+  const BookmarkNode* parent = node->parent();
   if (parent && parent->type() == BookmarkNode::FOLDER) {
     content::RecordAction(UserMetricsAction("BookmarkBarFolder_DragStart"));
   } else {
     content::RecordAction(UserMetricsAction("BookmarkBar_DragStart"));
   }
 
   dragMouseOffset_ = [self convertPoint:[event locationInWindow] fromView:nil];
   dragPending_ = YES;
   gDraggedButton = self;
 
   NSImage* image = [self dragImage];
   [self setHidden:YES];
 
-  NSPasteboardItem* pbItem = [NSPasteboardItem new];
-  [pbItem setDataProvider:self
-                 forTypes:@[ ui::ClipboardUtil::UTIForPasteboardType(
-                              kBookmarkButtonDragType) ]];
+  NSPasteboardItem* item = [[self delegate] pasteboardItemForDragOfButton:self];
+  if ([[self delegate] respondsToSelector:@selector(willBeginPasteboardDrag)])
+    [[self delegate] willBeginPasteboardDrag];
 
   base::scoped_nsobject<NSDraggingItem> dragItem(
-      [[NSDraggingItem alloc] initWithPasteboardWriter:pbItem]);
+      [[NSDraggingItem alloc] initWithPasteboardWriter:item]);
   [dragItem setDraggingFrame:[self bounds] contents:image];
 
   [self beginDraggingSessionWithItems:@[ dragItem.get() ]
                                 event:event
                                source:self];
   while (gDraggedButton != nil) {
     [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode
                              beforeDate:[NSDate distantFuture]];
   }
   [self setHidden:NO];
 
   // And we're done.
   dragPending_ = NO;
   gDraggedButton = nil;
 
   [self autorelease];
 }
 
-- (void)pasteboard:(NSPasteboard*)sender
-                  item:(NSPasteboardItem*)item
-    provideDataForType:(NSString*)type {
-  [sender
-      setData:[NSData dataWithBytes:&gDraggedButton
-                             length:sizeof(gDraggedButton)]
-      forType:ui::ClipboardUtil::UTIForPasteboardType(kBookmarkButtonDragType)];
-}
-
 - (NSDragOperation)draggingSession:(NSDraggingSession*)session
     sourceOperationMaskForDraggingContext:(NSDraggingContext)context {
   NSDragOperation operation = NSDragOperationCopy;
 
   if (context == NSDraggingContextWithinApplication)
     operation |= NSDragOperationMove;
 
   if ([delegate_ canDragBookmarkButtonToTrash:self])
     operation |= NSDragOperationDelete;
 
@@ skipping 232 matching lines @@
   [[cell clipPathForFrame:bounds inView:self] setClip];
   [cell drawWithFrame:bounds inView:self];
 
   CGContextEndTransparencyLayer(cgContext);
   [image unlockFocus];
 
   return image.autorelease();
 }
 
 @end