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

Unified Diff: ui/base/dragdrop/cocoa_dnd_util.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
« no previous file with comments | « ui/base/clipboard/clipboard_util_mac_unittest.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/dragdrop/cocoa_dnd_util.mm
diff --git a/ui/base/dragdrop/cocoa_dnd_util.mm b/ui/base/dragdrop/cocoa_dnd_util.mm
index bd639801db729b0ed234c90bf235eb2ed64d5839..9a0648e2ebbca70238257b4b0bc877fa0d2c12c6 100644
--- a/ui/base/dragdrop/cocoa_dnd_util.mm
+++ b/ui/base/dragdrop/cocoa_dnd_util.mm
@@ -22,15 +22,17 @@ BOOL PopulateURLAndTitleFromPasteboard(GURL* url,
CHECK(url);
// Bail out early if there's no URL data.
- if (![pboard containsURLData])
+ if (![pboard containsURLDataConvertingTextToURL:YES])
return NO;
// -getURLs:andTitles:convertingFilenames: will already validate URIs so we
// don't need to again. The arrays returned are both of NSStrings.
NSArray* url_array = nil;
NSArray* title_array = nil;
- [pboard getURLs:&url_array andTitles:&title_array
- convertingFilenames:convert_filenames];
+ [pboard getURLs:&url_array
+ andTitles:&title_array
+ convertingFilenames:convert_filenames
+ convertingTextToURL:YES];
DCHECK_EQ([url_array count], [title_array count]);
// It's possible that no URLs were actually provided!
if (![url_array count])
« no previous file with comments | « ui/base/clipboard/clipboard_util_mac_unittest.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698