Chromium Code Reviews| 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..8ec7f6f3b3147f3d95ad8a77cfb86170e2b8d458 100644 |
| --- a/content/browser/web_contents/web_drag_dest_mac.mm |
| +++ b/content/browser/web_contents/web_drag_dest_mac.mm |
| @@ -9,6 +9,7 @@ |
| #include "base/strings/sys_string_conversions.h" |
| #include "content/browser/renderer_host/render_view_host_impl.h" |
| #include "content/browser/web_contents/web_contents_impl.h" |
| +#include "content/public/browser/render_process_host.h" |
|
dcheng
2016/05/24 05:51:50
Nit: remove this include
hush (inactive)
2016/05/24 20:26:09
Done.
|
| #include "content/public/browser/web_contents_delegate.h" |
| #include "content/public/browser/web_drag_dest_delegate.h" |
| #include "content/public/common/drop_data.h" |
| @@ -130,6 +131,7 @@ int GetModifierFlags() { |
| dropData.reset(new DropData()); |
| [self populateDropData:dropData.get() |
| fromPasteboard:[info draggingPasteboard]]; |
| + currentRVH_->FilterDropData(dropData.get()); |
| NSDragOperation mask = [info draggingSourceOperationMask]; |
| @@ -254,9 +256,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(); |