Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3806)

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm

Issue 2014733003: Removing parsing of text from pasteboard. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Compilation fix Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm
index 029e4b4020d879c7e88cc2fc88dd60b02ae94474..eb1a0da06ebe12e0738607c2c49fab17830ed10d 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm
@@ -144,7 +144,7 @@ using bookmarks::BookmarkNode;
dataForType:ui::ClipboardUtil::UTIForPasteboardType(
kBookmarkButtonDragType)] ||
bookmarks::PasteboardContainsBookmarks(ui::CLIPBOARD_TYPE_DRAG) ||
- [[info draggingPasteboard] containsURLData]) {
+ [[info draggingPasteboard] containsURLDataConvertingTextToURL:YES]) {
// 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:
@@ -212,11 +212,14 @@ using bookmarks::BookmarkNode;
// performDragOperation: for URLs.
- (BOOL)performDragOperationForURL:(id<NSDraggingInfo>)info {
NSPasteboard* pboard = [info draggingPasteboard];
- DCHECK([pboard containsURLData]);
+ DCHECK([pboard containsURLDataConvertingTextToURL:YES]);
NSArray* urls = nil;
NSArray* titles = nil;
- [pboard getURLs:&urls andTitles:&titles convertingFilenames:YES];
+ [pboard getURLs:&urls
+ andTitles:&titles
+ convertingFilenames:YES
+ convertingTextToURL:YES];
return [controller_ addURLs:urls
withTitles:titles
@@ -267,7 +270,7 @@ using bookmarks::BookmarkNode;
return YES;
// Fall through....
}
- if ([pboard containsURLData]) {
+ if ([pboard containsURLDataConvertingTextToURL:YES]) {
if ([self performDragOperationForURL:info])
return YES;
}

Powered by Google App Engine
This is Rietveld 408576698