From 2b911e06c223619363c757221515c9d4601cbccd Mon Sep 17 00:00:00 2001 From: "estade@chromium.org" Date: Thu, 23 Jul 2009 21:35:19 +0000 Subject: Bookmark bar: Don't connect to the OnDragDrop signal since we can just use the default. Eventually we may want to allow dropping more different types, and we will need to implement an OnDragDrop handler so we can properly prioritize these types (preferring BOOKMARK_ITEM over TEXT_PLAIN and so forth). But for now we can just use the default handler. BUG=17501 TEST=drag an image onto the bookmark bar, note that there is only one link created Review URL: http://codereview.chromium.org/159256 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21448 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/gtk/bookmark_bar_gtk.cc | 21 --------------------- chrome/browser/gtk/bookmark_bar_gtk.h | 3 --- 2 files changed, 24 deletions(-) (limited to 'chrome') diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc index 4eb07d4..877d2af 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.cc +++ b/chrome/browser/gtk/bookmark_bar_gtk.cc @@ -166,8 +166,6 @@ void BookmarkBarGtk::Init(Profile* profile) { G_CALLBACK(&OnToolbarDragMotion), this); g_signal_connect(bookmark_toolbar_.get(), "drag-leave", G_CALLBACK(&OnToolbarDragLeave), this); - g_signal_connect(bookmark_toolbar_.get(), "drag-drop", - G_CALLBACK(&OnToolbarDragDrop), this); g_signal_connect(bookmark_toolbar_.get(), "drag-data-received", G_CALLBACK(&OnToolbarDragReceived), this); g_signal_connect(bookmark_toolbar_.get(), "button-press-event", @@ -773,25 +771,6 @@ void BookmarkBarGtk::OnToolbarDragLeave(GtkToolbar* toolbar, } // static -gboolean BookmarkBarGtk::OnToolbarDragDrop( - GtkWidget* widget, GdkDragContext* context, - gint x, gint y, guint time, - BookmarkBarGtk* bar) { - gboolean is_valid_drop_site = FALSE; - - if (context->targets) { - GdkAtom target_type = - GDK_POINTER_TO_ATOM(g_list_nth_data( - context->targets, GtkDndUtil::CHROME_BOOKMARK_ITEM)); - gtk_drag_get_data(widget, context, target_type, time); - - is_valid_drop_site = TRUE; - } - - return is_valid_drop_site; -} - -// static void BookmarkBarGtk::OnToolbarDragReceived(GtkWidget* widget, GdkDragContext* context, gint x, gint y, diff --git a/chrome/browser/gtk/bookmark_bar_gtk.h b/chrome/browser/gtk/bookmark_bar_gtk.h index 626c5eb0..faac53a 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.h +++ b/chrome/browser/gtk/bookmark_bar_gtk.h @@ -184,9 +184,6 @@ class BookmarkBarGtk : public AnimationDelegate, GdkDragContext* context, guint time, BookmarkBarGtk* bar); - 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, -- cgit v1.1