GTK: Modify the bookmark bar to actually use GTK drag and drop.

(Previously, DnD support was faked and would crash the application
in a variety of not-really corner cases.)

http://crbug.com/10964

Review URL: http://codereview.chromium.org/115388

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16203 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 5 deletions

diff --git a/chrome/browser/gtk/bookmark_bar_gtk.h b/chrome/browser/gtk/bookmark_bar_gtk.h
index 697b55c..72f42c6 100644
--- a/chrome/browser/gtk/bookmark_bar_gtk.h
+++ b/chrome/browser/gtk/bookmark_bar_gtk.h
@@ -137,6 +137,10 @@ class BookmarkBarGtk : public BookmarkModelObserver {
   static void OnButtonDragEnd(GtkWidget* button,
                               GdkDragContext* drag_context,
                               BookmarkBarGtk* bar);
+  static void OnButtonDragGet(GtkWidget* widget, GdkDragContext* context,
+                              GtkSelectionData* selection_data,
+                              guint target_type, guint time,
+                              BookmarkBarGtk* bar);
 
   // GtkButton callbacks for folder buttons
   static gboolean OnFolderButtonReleased(GtkWidget* sender,
@@ -156,11 +160,14 @@ class BookmarkBarGtk : public BookmarkModelObserver {
                                  GdkDragContext* context,
                                  guint time,
                                  BookmarkBarGtk* bar);
-  static gboolean OnToolbarDragDrop(GtkWidget* toolbar,
-                                    GdkDragContext* drag_context,
-                                    gint x,
-                                    gint y,
-                                    guint time,
+  static gboolean OnToolbarDragDrop(GtkWidget* widget, GdkDragContext* context,
+                                    gint x, gint y, guint time,
+                                    BookmarkBarGtk* bar);
+  static void OnToolbarDragReceived(GtkWidget* widget,
+                                    GdkDragContext* context,
+                                    gint x, gint y,
+                                    GtkSelectionData* selection_data,
+                                    guint target_type, guint time,
                                     BookmarkBarGtk* bar);
 
   Profile* profile_;