| Index: content/browser/web_contents/web_drag_dest_mac.mm
|
| diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm
|
| index b1dde1820a168023f32964d58b10c73b6880f31f..096c1398d7d321919c1c9573aaa44a073302f621 100644
|
| --- a/content/browser/web_contents/web_drag_dest_mac.mm
|
| +++ b/content/browser/web_contents/web_drag_dest_mac.mm
|
| @@ -261,7 +261,7 @@ int GetModifierFlags() {
|
|
|
| // Get plain text.
|
| if ([types containsObject:NSStringPboardType]) {
|
| - data->text = NullableString16(
|
| + data->text = base::NullableString16(
|
| base::SysNSStringToUTF16([pboard stringForType:NSStringPboardType]),
|
| false);
|
| }
|
| @@ -269,13 +269,13 @@ int GetModifierFlags() {
|
| // Get HTML. If there's no HTML, try RTF.
|
| if ([types containsObject:NSHTMLPboardType]) {
|
| NSString* html = [pboard stringForType:NSHTMLPboardType];
|
| - data->html = NullableString16(base::SysNSStringToUTF16(html), false);
|
| + data->html = base::NullableString16(base::SysNSStringToUTF16(html), false);
|
| } else if ([types containsObject:ui::kChromeDragImageHTMLPboardType]) {
|
| NSString* html = [pboard stringForType:ui::kChromeDragImageHTMLPboardType];
|
| - data->html = NullableString16(base::SysNSStringToUTF16(html), false);
|
| + data->html = base::NullableString16(base::SysNSStringToUTF16(html), false);
|
| } else if ([types containsObject:NSRTFPboardType]) {
|
| NSString* html = [pboard htmlFromRtf];
|
| - data->html = NullableString16(base::SysNSStringToUTF16(html), false);
|
| + data->html = base::NullableString16(base::SysNSStringToUTF16(html), false);
|
| }
|
|
|
| // Get files.
|
|
|