Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3896)

Unified Diff: chrome/browser/cocoa/web_drop_target.mm

Issue 1029004: GTK: implement extension bookmark manager drag api.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/bookmarks/bookmark_utils.cc ('k') | chrome/browser/download/download_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cocoa/web_drop_target.mm
===================================================================
--- chrome/browser/cocoa/web_drop_target.mm (revision 41880)
+++ chrome/browser/cocoa/web_drop_target.mm (working copy)
@@ -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 @@
// 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 @@
// 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 @@
// 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;
« no previous file with comments | « chrome/browser/bookmarks/bookmark_utils.cc ('k') | chrome/browser/download/download_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698