mac: More pasteboard fixes.

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"
 #import "base/mac/scoped_nsobject.h"
 #include "base/mac/sdk_forward_declarations.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "content/public/browser/user_metrics.h"
+#include "ui/base/clipboard/clipboard_util_mac.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 using base::UserMetricsAction;
 using bookmarks::BookmarkNode;
 
 // The opacity of the bookmark button drag image.
 static const CGFloat kDragImageOpacity = 0.7;
 
@@ skipping 178 matching lines @@
   }
 
   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:@[ kBookmarkButtonDragType ]];
+  [pbItem setDataProvider:self
+                 forTypes:@[ ui::ClipboardUtil::UTIForPasteboardType(
+                              kBookmarkButtonDragType) ]];
 
   base::scoped_nsobject<NSDraggingItem> dragItem(
       [[NSDraggingItem alloc] initWithPasteboardWriter:pbItem]);
   [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:kBookmarkButtonDragType];
+  [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])
@@ skipping 234 matching lines @@
   [[cell clipPathForFrame:bounds inView:self] setClip];
   [cell drawWithFrame:bounds inView:self];
 
   CGContextEndTransparencyLayer(cgContext);
   [image unlockFocus];
 
   return image.autorelease();
 }
 
 @end