summaryrefslogtreecommitdiffstats
path: root/content/public/browser
diff options
context:
space:
mode:
authorrbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-22 18:16:24 +0000
committerrbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-22 18:16:24 +0000
commit159d5148a4efe6771fbf6474d0a8e9a4b96a7cd6 (patch)
tree9d501b0a99d9e4b43a848d66eadc07a0ba1c3a93 /content/public/browser
parent8e80e640108d2ac00353490ac1d418ded10ecb8e (diff)
downloadchromium_src-159d5148a4efe6771fbf6474d0a8e9a4b96a7cd6.zip
chromium_src-159d5148a4efe6771fbf6474d0a8e9a4b96a7cd6.tar.gz
chromium_src-159d5148a4efe6771fbf6474d0a8e9a4b96a7cd6.tar.bz2
Support custom drag-and-drop of bookmarks in Aura
This follows the pattern used on other platforms to hook up the bookmark manager to the native drag and drop system, except that on Aura we avoid the need for the extra abstraction provided by WebDragDest/WebDragDestDelegate since we don't have applications outside of chrome we need to interact with. BUG=117012 TEST=drag bookmarks around in the bookmark manager, and to/from the bookmark bar Review URL: http://codereview.chromium.org/9757001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128250 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public/browser')
-rw-r--r--content/public/browser/web_drag_dest_delegate.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/content/public/browser/web_drag_dest_delegate.h b/content/public/browser/web_drag_dest_delegate.h
index 7924a64..bb65e16 100644
--- a/content/public/browser/web_drag_dest_delegate.h
+++ b/content/public/browser/web_drag_dest_delegate.h
@@ -36,7 +36,7 @@ class WebDragDestDelegate {
virtual void DragInitialize(WebContents* contents) = 0;
// Notifications of drag progression.
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
virtual void OnDragOver(IDataObject* data_object) = 0;
virtual void OnDragEnter(IDataObject* data_object) = 0;
virtual void OnDrop(IDataObject* data_object) = 0;
@@ -58,6 +58,10 @@ class WebDragDestDelegate {
virtual void OnReceiveDataFromGtk(GtkSelectionData* data) = 0;
virtual void OnReceiveProcessedData(const GURL& url,
const string16& title) = 0;
+#elif defined(USE_AURA)
+ // Called at the start of every drag to supply the data associated with the
+ // drag.
+ virtual void OnReceiveDragData(const ui::OSExchangeData& data) = 0;
#elif defined(OS_WIN)
// Allows the delegate to set data on the drag. If it doesn't want to set
// data, it should return false.