| 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 ec3b00035ddbea2fe261fc4456aab6320a9c8158..0b956d1acc1e937182baf34ae7b0b954bd9740bf 100644
|
| --- a/content/browser/web_contents/web_drag_dest_mac.mm
|
| +++ b/content/browser/web_contents/web_drag_dest_mac.mm
|
| @@ -130,6 +130,7 @@ int GetModifierFlags() {
|
| dropData.reset(new DropData());
|
| [self populateDropData:dropData.get()
|
| fromPasteboard:[info draggingPasteboard]];
|
| + currentRVH_->FilterDropData(dropData.get());
|
|
|
| NSDragOperation mask = [info draggingSourceOperationMask];
|
|
|
| @@ -254,9 +255,8 @@ int GetModifierFlags() {
|
| NSPoint viewPoint = [self flipWindowPointToView:windowPoint view:view];
|
| NSPoint screenPoint = [self flipWindowPointToScreen:windowPoint view:view];
|
| webContents_->GetRenderViewHost()->DragTargetDrop(
|
| - gfx::Point(viewPoint.x, viewPoint.y),
|
| - gfx::Point(screenPoint.x, screenPoint.y),
|
| - GetModifierFlags());
|
| + *dropData_, gfx::Point(viewPoint.x, viewPoint.y),
|
| + gfx::Point(screenPoint.x, screenPoint.y), GetModifierFlags());
|
|
|
| dropData_.reset();
|
|
|
| @@ -282,6 +282,10 @@ int GetModifierFlags() {
|
| pboard,
|
| NO);
|
|
|
| + if (data->url.is_valid()) {
|
| + data->has_url = true;
|
| + }
|
| +
|
| // Get plain text.
|
| if ([types containsObject:NSStringPboardType]) {
|
| data->text = base::NullableString16(
|
|
|