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

Unified Diff: chrome/browser/tab_contents/web_drop_target_win.cc

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/tab_contents/web_drag_dest_gtk.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/tab_contents/web_drop_target_win.cc
===================================================================
--- chrome/browser/tab_contents/web_drop_target_win.cc (revision 41880)
+++ chrome/browser/tab_contents/web_drop_target_win.cc (working copy)
@@ -10,6 +10,7 @@
#include "app/clipboard/clipboard_util_win.h"
#include "app/os_exchange_data.h"
#include "app/os_exchange_data_provider_win.h"
+#include "chrome/browser/bookmarks/bookmark_drag_data.h"
#include "chrome/browser/renderer_host/render_view_host.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "gfx/point.h"
@@ -122,7 +123,9 @@
// support for (at the moment experimental) drag and drop extensions.
if (tab_contents_->GetBookmarkDragDelegate()) {
OSExchangeData os_exchange_data(new OSExchangeDataProviderWin(data_object));
- tab_contents_->GetBookmarkDragDelegate()->OnDragEnter(&os_exchange_data);
+ BookmarkDragData bookmark_drag_data;
+ if (bookmark_drag_data.Read(os_exchange_data))
+ tab_contents_->GetBookmarkDragDelegate()->OnDragEnter(bookmark_drag_data);
}
// We lie here and always return a DROPEFFECT because we don't want to
@@ -150,7 +153,9 @@
if (tab_contents_->GetBookmarkDragDelegate()) {
OSExchangeData os_exchange_data(new OSExchangeDataProviderWin(data_object));
- tab_contents_->GetBookmarkDragDelegate()->OnDragOver(&os_exchange_data);
+ BookmarkDragData bookmark_drag_data;
+ if (bookmark_drag_data.Read(os_exchange_data))
+ tab_contents_->GetBookmarkDragDelegate()->OnDragOver(bookmark_drag_data);
}
if (!is_drop_target_)
@@ -172,7 +177,9 @@
if (tab_contents_->GetBookmarkDragDelegate()) {
OSExchangeData os_exchange_data(new OSExchangeDataProviderWin(data_object));
- tab_contents_->GetBookmarkDragDelegate()->OnDragLeave(&os_exchange_data);
+ BookmarkDragData bookmark_drag_data;
+ if (bookmark_drag_data.Read(os_exchange_data))
+ tab_contents_->GetBookmarkDragDelegate()->OnDragLeave(bookmark_drag_data);
}
}
@@ -198,7 +205,9 @@
if (tab_contents_->GetBookmarkDragDelegate()) {
OSExchangeData os_exchange_data(new OSExchangeDataProviderWin(data_object));
- tab_contents_->GetBookmarkDragDelegate()->OnDrop(&os_exchange_data);
+ BookmarkDragData bookmark_drag_data;
+ if (bookmark_drag_data.Read(os_exchange_data))
+ tab_contents_->GetBookmarkDragDelegate()->OnDrop(bookmark_drag_data);
}
current_rvh_ = NULL;
« no previous file with comments | « chrome/browser/tab_contents/web_drag_dest_gtk.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698