mac: More pasteboard fixes.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.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_bar_folder_view.h"
 
 #include "chrome/browser/profiles/profile.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "components/bookmarks/browser/bookmark_pasteboard_helper_mac.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "content/public/browser/user_metrics.h"
 
 using base::UserMetricsAction;
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 
 #import "third_party/mozilla/NSPasteboard+Utils.h"
+#include "ui/base/clipboard/clipboard_util_mac.h"
 
 @interface BookmarkBarFolderView()
 
 @property(readonly, nonatomic) id<BookmarkButtonControllerProtocol> controller;
 
 - (void)setDropIndicatorShown:(BOOL)flag;
 
 @end
 
 @implementation BookmarkBarFolderView
 
 - (void)awakeFromNib {
-  NSArray* types = [NSArray arrayWithObjects:
-                    NSStringPboardType,
-                    NSHTMLPboardType,
-                    NSURLPboardType,
-                    kBookmarkButtonDragType,
-                    kBookmarkDictionaryListPboardType,
-                    nil];
+  NSArray* types = @[
+    NSStringPboardType, NSHTMLPboardType, NSURLPboardType,
+    ui::ClipboardUtil::UTIForPasteboardType(kBookmarkButtonDragType),
+    ui::ClipboardUtil::UTIForPasteboardType(kBookmarkDictionaryListPboardType)
+  ];
   [self registerForDraggedTypes:types];
 }
 
 - (void)dealloc {
   [self unregisterDraggedTypes];
   [super dealloc];
 }
 
 - (id<BookmarkButtonControllerProtocol>)controller {
   // When needed for testing, set the local data member |controller_| to
   // the test controller.
   return controller_ ? controller_ : [[self window] windowController];
 }
 
 // Virtually identical to [BookmarkBarView draggingEntered:].
 // TODO(jrg): find a way to share code.  Lack of multiple inheritance
 // makes things more of a pain but there should be no excuse for laziness.
 // http://crbug.com/35966
 - (NSDragOperation)draggingEntered:(id<NSDraggingInfo>)info {
   inDrag_ = YES;
   if (![[self controller] draggingAllowed:info])
     return NSDragOperationNone;
-  if ([[info draggingPasteboard] dataForType:kBookmarkButtonDragType] ||
+  if ([[info draggingPasteboard]
+          dataForType:ui::ClipboardUtil::UTIForPasteboardType(
+                          kBookmarkButtonDragType)] ||
       bookmarks::PasteboardContainsBookmarks(ui::CLIPBOARD_TYPE_DRAG) ||
       [[info draggingPasteboard] containsURLData]) {
     // Find the position of the drop indicator.
     BOOL showIt = [[self controller]
                    shouldShowIndicatorShownForPoint:[info draggingLocation]];
     if (!showIt) {
       [self setDropIndicatorShown:NO];
     } else {
       [self setDropIndicatorShown:YES];
 
@@ skipping 70 matching lines @@
 }
 
 // This code is practically identical to the same function in BookmarkBarView
 // with the only difference being how the controller is retrieved.
 // http://crbug.com/35966
 // Implement NSDraggingDestination protocol method
 // performDragOperation: for bookmark buttons.
 - (BOOL)performDragOperationForBookmarkButton:(id<NSDraggingInfo>)info {
   BOOL doDrag = NO;
   NSData* data = [[info draggingPasteboard]
-                   dataForType:kBookmarkButtonDragType];
+      dataForType:ui::ClipboardUtil::UTIForPasteboardType(
+                      kBookmarkButtonDragType)];
   // [info draggingSource] is nil if not the same application.
   if (data && [info draggingSource]) {
     BookmarkButton* button = nil;
     [data getBytes:&button length:sizeof(button)];
 
     // If we're dragging from one profile to another, disallow moving (only
     // allow copying). Each profile has its own bookmark model, so one way to
     // check whether we are dragging across profiles is to see if the
     // |BookmarkNode| corresponding to |button| exists in this profile. If it
     // does, we're dragging within a profile; otherwise, we're dragging across
@@ skipping 11 matching lines @@
                                       copy:copy];
     content::RecordAction(UserMetricsAction("BookmarkBarFolder_DragEnd"));
   }
   return doDrag;
 }
 
 - (BOOL)performDragOperation:(id<NSDraggingInfo>)info {
   if ([[self controller] dragBookmarkData:info])
     return YES;
   NSPasteboard* pboard = [info draggingPasteboard];
-  if ([pboard dataForType:kBookmarkButtonDragType] &&
+  if ([pboard dataForType:ui::ClipboardUtil::UTIForPasteboardType(
+                              kBookmarkButtonDragType)] &&
       [self performDragOperationForBookmarkButton:info])
     return YES;
   if ([pboard containsURLData] && [self performDragOperationForURL:info])
     return YES;
   return NO;
 }
 
 - (void)setDropIndicatorShown:(BOOL)flag {
   if (dropIndicatorShown_ == flag)
     return;
 
   dropIndicatorShown_ = flag;
   if (dropIndicatorShown_) {
     NSRect frame = NSInsetRect([self bounds], 4, 0);
     frame.size.height = 1;
     dropIndicator_.reset([[NSBox alloc] initWithFrame:frame]);
     [dropIndicator_ setBoxType:NSBoxSeparator];
     [dropIndicator_ setBorderType:NSLineBorder];
     [dropIndicator_ setAlphaValue:0.85];
     [self addSubview:dropIndicator_];
   } else {
     [dropIndicator_ removeFromSuperview];
     dropIndicator_.reset();
   }
 }
 
 @end