diff options
Diffstat (limited to 'chrome/browser/cocoa/web_drop_target.mm')
| -rw-r--r-- | chrome/browser/cocoa/web_drop_target.mm | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/chrome/browser/cocoa/web_drop_target.mm b/chrome/browser/cocoa/web_drop_target.mm index 06e0a98..b051772 100644 --- a/chrome/browser/cocoa/web_drop_target.mm +++ b/chrome/browser/cocoa/web_drop_target.mm @@ -5,6 +5,7 @@ #import "chrome/browser/cocoa/web_drop_target.h" #include "base/sys_string_conversions.h" +#include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -82,8 +83,9 @@ using WebKit::WebDragOperationsMask; // If the tab is showing the boomark manager, send BookmarkDrag events RenderViewHostDelegate::BookmarkDrag* dragDelegate = tabContents_->GetBookmarkDragDelegate(); - if(dragDelegate) - dragDelegate->OnDragEnter(NULL); + BookmarkDragData dragData; + if(dragDelegate && dragData.ReadFromDragClipboard()) + dragDelegate->OnDragEnter(dragData); // Fill out a WebDropData from pasteboard. WebDropData data; @@ -142,8 +144,9 @@ using WebKit::WebDragOperationsMask; // If the tab is showing the boomark manager, send BookmarkDrag events RenderViewHostDelegate::BookmarkDrag* dragDelegate = tabContents_->GetBookmarkDragDelegate(); - if(dragDelegate) - dragDelegate->OnDragOver(NULL); + BookmarkDragData dragData; + if(dragDelegate && dragData.ReadFromDragClipboard()) + dragDelegate->OnDragOver(dragData); return current_operation_; } @@ -168,8 +171,9 @@ using WebKit::WebDragOperationsMask; // If the tab is showing the boomark manager, send BookmarkDrag events RenderViewHostDelegate::BookmarkDrag* dragDelegate = tabContents_->GetBookmarkDragDelegate(); - if(dragDelegate) - dragDelegate->OnDrop(NULL); + BookmarkDragData dragData; + if(dragDelegate && dragData.ReadFromDragClipboard()) + dragDelegate->OnDrop(dragData); currentRVH_ = NULL; |