mac: More pasteboard fixes.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.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_view_cocoa.h"
 
 #include "chrome/browser/profiles/profile.h"
 #import "chrome/browser/themes/theme_properties.h"
 #import "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.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/themed_window.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "components/bookmarks/browser/bookmark_pasteboard_helper_mac.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "content/public/browser/user_metrics.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
+#include "ui/base/clipboard/clipboard_util_mac.h"
 #import "ui/base/cocoa/nsview_additions.h"
 
 using base::UserMetricsAction;
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 
 @interface BookmarkBarView (Private)
 - (void)themeDidChangeNotification:(NSNotification*)aNotification;
 - (void)updateTheme:(const ui::ThemeProvider*)themeProvider;
 
@@ skipping 30 matching lines @@
 }
 
 - (void)awakeFromNib {
   NSNotificationCenter* defaultCenter = [NSNotificationCenter defaultCenter];
   [defaultCenter addObserver:self
                     selector:@selector(themeDidChangeNotification:)
                         name:kBrowserThemeDidChangeNotification
                       object:nil];
 
   DCHECK(controller_) << "Expected this to be hooked up via Interface Builder";
-  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];
 }
 
 // We need the theme to color the bookmark buttons properly.  But our
 // controller desn't have access to it until it's placed in the view
 // hierarchy.  This is the spot where we close the loop.
 - (void)viewWillMoveToWindow:(NSWindow*)window {
   const ui::ThemeProvider* themeProvider = [window themeProvider];
   [self updateTheme:themeProvider];
   [controller_ updateTheme:themeProvider];
@@ skipping 46 matching lines @@
     [controller_ setDropInsertionPos:dropIndicatorPosition_];
   else
     [controller_ clearDropInsertionPos];
 }
 
 // NSDraggingDestination methods
 
 - (NSDragOperation)draggingEntered:(id<NSDraggingInfo>)info {
   if (![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]) {
     // We only show the drop indicator if we're not in a position to
     // perform a hover-open since it doesn't make sense to do both.
     BOOL showIt = [controller_ shouldShowIndicatorShownForPoint:
                    [info draggingLocation]];
     if (!showIt) {
       if (dropIndicatorShown_) {
         dropIndicatorShown_ = NO;
         [self dropIndicatorChanged];
@@ skipping 65 matching lines @@
   return [controller_ addURLs:urls
                    withTitles:titles
                            at:[info draggingLocation]];
 }
 
 // Implement NSDraggingDestination protocol method
 // performDragOperation: for bookmark buttons.
 - (BOOL)performDragOperationForBookmarkButton:(id<NSDraggingInfo>)info {
   BOOL rtn = 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("BookmarkBar_DragEnd"));
   }
   return rtn;
 }
 
 - (BOOL)performDragOperation:(id<NSDraggingInfo>)info {
   if ([controller_ dragBookmarkData:info])
     return YES;
   NSPasteboard* pboard = [info draggingPasteboard];
-  if ([pboard dataForType:kBookmarkButtonDragType]) {
+  if ([pboard dataForType:ui::ClipboardUtil::UTIForPasteboardType(
+                              kBookmarkButtonDragType)]) {
     if ([self performDragOperationForBookmarkButton:info])
       return YES;
     // Fall through....
   }
   if ([pboard containsURLData]) {
     if ([self performDragOperationForURL:info])
       return YES;
   }
   return NO;
 }
@@ skipping 20 matching lines @@
 
 @end  // @implementation BookmarkBarTextField
 
 @implementation BookmarkBarItemContainer
 
 - (NSMenu*)menu {
   return [barView_ menu];
 }
 
 @end  // @implementation BookmarkBarItemContainer