Bookmark bar: Don't connect to the OnDragDrop signal since we can just use th...

chrome/browser/gtk/bookmark_bar_gtk.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/gtk/bookmark_bar_gtk.h"
 
 #include <vector>
 
 #include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
@@ skipping 147 matching lines @@
 
   gtk_drag_dest_set(bookmark_toolbar_.get(), GTK_DEST_DEFAULT_DROP,
                     NULL, 0, GDK_ACTION_MOVE);
   GtkDndUtil::SetDestTargetListFromCodeMask(bookmark_toolbar_.get(),
                                             GtkDndUtil::CHROME_BOOKMARK_ITEM |
                                             GtkDndUtil::CHROME_NAMED_URL);
   g_signal_connect(bookmark_toolbar_.get(), "drag-motion",
                    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",
                    G_CALLBACK(&OnButtonPressed), this);
 
   gtk_box_pack_start(GTK_BOX(bookmark_hbox_), gtk_vseparator_new(),
                      FALSE, FALSE, 0);
 
   // We pack the button manually (rather than using gtk_button_set_*) so that
   // we can have finer control over its label.
@@ skipping 585 matching lines @@
                                         BookmarkBarGtk* bar) {
   if (bar->toolbar_drop_item_) {
     g_object_unref(bar->toolbar_drop_item_);
     bar->toolbar_drop_item_ = NULL;
   }
 
   gtk_toolbar_set_drop_highlight_item(toolbar, NULL, 0);
 }
 
 // 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,
                                            GtkSelectionData* selection_data,
                                            guint target_type, guint time,
                                            BookmarkBarGtk* bar) {
   gboolean dnd_success = FALSE;
   gboolean delete_selection_data = FALSE;
 
   gint index = gtk_toolbar_get_drop_index(
@@ skipping 34 matching lines @@
   bar->InitBackground();
   gfx::Point tabstrip_origin =
       bar->window_->tabstrip()->GetTabStripOriginForWidget(widget);
   bar->background_ninebox_->RenderTopCenterStrip(
       cr, tabstrip_origin.x(), tabstrip_origin.y(),
       event->area.x + event->area.width - tabstrip_origin.x());
   cairo_destroy(cr);
 
   return FALSE;  // Propagate expose to children.
 }