| Index: content/browser/web_contents/web_contents_view_aura.cc
|
| diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
|
| index 63856d1e2de32e4050125482d19cbdac4724eb35..8c7473a485965c69fa910a0f784307ffce0a0b8e 100644
|
| --- a/content/browser/web_contents/web_contents_view_aura.cc
|
| +++ b/content/browser/web_contents/web_contents_view_aura.cc
|
| @@ -330,6 +330,7 @@ void PrepareDropData(DropData* drop_data, const ui::OSExchangeData& data) {
|
| data.GetURLAndTitle(
|
| ui::OSExchangeData::DO_NOT_CONVERT_FILENAMES, &url, &url_title);
|
| if (url.is_valid()) {
|
| + drop_data->has_url = true;
|
| drop_data->url = url;
|
| drop_data->url_title = url_title;
|
| }
|
| @@ -1049,6 +1050,9 @@ void WebContentsViewAura::OnDragEntered(const ui::DropTargetEvent& event) {
|
| current_drop_data_.reset(new DropData());
|
|
|
| PrepareDropData(current_drop_data_.get(), event.data());
|
| +
|
| + web_contents_->GetRenderViewHost()->FilterDropData(current_drop_data_.get());
|
| +
|
| blink::WebDragOperationsMask op = ConvertToWeb(event.source_operations());
|
|
|
| // Give the delegate an opportunity to cancel the drag.
|
| @@ -1064,7 +1068,7 @@ void WebContentsViewAura::OnDragEntered(const ui::DropTargetEvent& event) {
|
|
|
| gfx::Point screen_pt = display::Screen::GetScreen()->GetCursorScreenPoint();
|
| web_contents_->GetRenderViewHost()->DragTargetDragEnter(
|
| - *current_drop_data_.get(), event.location(), screen_pt, op,
|
| + *current_drop_data_, event.location(), screen_pt, op,
|
| ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
|
|
|
| if (drag_dest_delegate_) {
|
| @@ -1117,7 +1121,8 @@ int WebContentsViewAura::OnPerformDrop(const ui::DropTargetEvent& event) {
|
| return ui::DragDropTypes::DRAG_NONE;
|
|
|
| web_contents_->GetRenderViewHost()->DragTargetDrop(
|
| - event.location(), display::Screen::GetScreen()->GetCursorScreenPoint(),
|
| + *current_drop_data_, event.location(),
|
| + display::Screen::GetScreen()->GetCursorScreenPoint(),
|
| ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
|
| if (drag_dest_delegate_)
|
| drag_dest_delegate_->OnDrop();
|
|
|