| 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..692ce86ca5f95bc5f2eb004c9b454d4ce95810a8 100644
|
| --- a/ui/base/dragdrop/cocoa_dnd_util.mm
|
| +++ b/ui/base/dragdrop/cocoa_dnd_util.mm
|
| @@ -22,14 +22,14 @@ BOOL PopulateURLAndTitleFromPasteboard(GURL* url,
|
| CHECK(url);
|
|
|
| // Bail out early if there's no URL data.
|
| - if (![pboard containsURLData])
|
| + if (![pboard containsURLDataInTypeOrText])
|
| 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
|
| + [pboard getURLsFromTypeOrText:&url_array andTitles:&title_array
|
| convertingFilenames:convert_filenames];
|
| DCHECK_EQ([url_array count], [title_array count]);
|
| // It's possible that no URLs were actually provided!
|
|
|