Removing parsing of text from pasteboard.

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"
@@ skipping 43 matching lines @@
 // 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:ui::ClipboardUtil::UTIForPasteboardType(
                           kBookmarkButtonDragType)] ||
       bookmarks::PasteboardContainsBookmarks(ui::CLIPBOARD_TYPE_DRAG) ||
-      [[info draggingPasteboard] containsURLData]) {
+      [[info draggingPasteboard] containsURLDataInTypeOrText]) {
     // Find the position of the drop indicator.
     BOOL showIt = [[self controller]
                    shouldShowIndicatorShownForPoint:[info draggingLocation]];
     if (!showIt) {
       [self setDropIndicatorShown:NO];
     } else {
       [self setDropIndicatorShown:YES];
 
       CGFloat y = [[self controller]
           indicatorPosForDragToPoint:[info draggingLocation]];
@@ skipping 49 matching lines @@
   return YES;
 }
 
 // This code is practically identical to the same function in BookmarkBarView
 // with the only difference being how the controller is retrieved.
 // TODO(mrossetti,jrg): http://crbug.com/35966
 // Implement NSDraggingDestination protocol method
 // performDragOperation: for URLs.
 - (BOOL)performDragOperationForURL:(id<NSDraggingInfo>)info {
   NSPasteboard* pboard = [info draggingPasteboard];
-  DCHECK([pboard containsURLData]);
+  DCHECK([pboard containsURLDataInTypeOrText]);
 
   NSArray* urls = nil;
   NSArray* titles = nil;
-  [pboard getURLs:&urls andTitles:&titles convertingFilenames:YES];
+  [pboard getURLsFromTypeOrText:&urls
+                      andTitles:&titles
+            convertingFilenames:YES];
 
   return [[self controller] addURLs:urls
                          withTitles:titles
                                  at:[info draggingLocation]];
 }
 
 // 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
@@ skipping 31 matching lines @@
 }
 
 - (BOOL)performDragOperation:(id<NSDraggingInfo>)info {
   if ([[self controller] dragBookmarkData:info])
     return YES;
   NSPasteboard* pboard = [info draggingPasteboard];
   if ([pboard dataForType:ui::ClipboardUtil::UTIForPasteboardType(
                               kBookmarkButtonDragType)] &&
       [self performDragOperationForBookmarkButton:info])
     return YES;
-  if ([pboard containsURLData] && [self performDragOperationForURL:info])
+  if ([pboard containsURLDataInTypeOrText] &&
+      [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