GTK: fix site type icon dragging.

chrome/browser/gtk/location_bar_view_gtk.cc

 // Copyright (c) 2010 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/location_bar_view_gtk.h"
 
 #include <string>
 
 #include "app/gtk_dnd_util.h"
 #include "app/l10n_util.h"
@@ skipping 301 matching lines @@
 
   GtkWidget* site_type_hbox = gtk_hbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(site_type_hbox), location_icon_image_,
                      FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(site_type_hbox), security_info_label_,
                      FALSE, FALSE, kCornerSize);
 
   site_type_event_box_ = gtk_event_box_new();
   gtk_widget_modify_bg(site_type_event_box_, GTK_STATE_NORMAL,
                        &kEvSecureBackgroundColor);
+  g_signal_connect(site_type_event_box_, "drag-data-get",
+                   G_CALLBACK(&OnIconDragDataThunk), this);
+  g_signal_connect(site_type_event_box_, "drag-begin",
+                   G_CALLBACK(&OnIconDragBeginThunk), this);
+  g_signal_connect(site_type_event_box_, "drag-end",
+                   G_CALLBACK(&OnIconDragEndThunk), this);
 
   // Make the event box not visible so it does not paint a background.
   gtk_event_box_set_visible_window(GTK_EVENT_BOX(site_type_event_box_),
                                    FALSE);
   gtk_widget_set_name(site_type_event_box_,
                       "chrome-location-icon-eventbox");
   gtk_container_add(GTK_CONTAINER(site_type_event_box_),
                     site_type_hbox);
 
   // Put the event box in an alignment to get the padding correct.
@@ skipping 19 matching lines @@
     gtk_drag_source_unset(site_type_event_box_);
     return;
   }
 
   gtk_drag_source_set(site_type_event_box_, GDK_BUTTON1_MASK,
                       NULL, 0, GDK_ACTION_COPY);
   gtk_dnd_util::SetSourceTargetListFromCodeMask(site_type_event_box_,
                                                 gtk_dnd_util::TEXT_PLAIN |
                                                 gtk_dnd_util::TEXT_URI_LIST |
                                                 gtk_dnd_util::CHROME_NAMED_URL);
-
-  g_signal_connect(site_type_event_box_, "drag-data-get",
-                   G_CALLBACK(&OnIconDragDataThunk), this);
-  g_signal_connect(site_type_event_box_, "drag-begin",
-                   G_CALLBACK(&OnIconDragBeginThunk), this);
-  g_signal_connect(site_type_event_box_, "drag-end",
-                   G_CALLBACK(&OnIconDragEndThunk), this);
 }
 
 void LocationBarViewGtk::SetProfile(Profile* profile) {
   profile_ = profile;
 }
 
 TabContents* LocationBarViewGtk::GetTabContents() const {
   return browser_->GetSelectedTabContents();
 }
 
@@ skipping 621 matching lines @@
   if (!pixbuf)
     return;
   drag_icon_ = bookmark_utils::GetDragRepresentation(pixbuf, GetTitle(),
                                                      theme_provider_);
   g_object_unref(pixbuf);
   gtk_drag_set_icon_widget(context, drag_icon_, 0, 0);
 }
 
 void LocationBarViewGtk::OnIconDragEnd(GtkWidget* sender,
                                        GdkDragContext* context) {
+  DCHECK(drag_icon_);
   gtk_widget_destroy(drag_icon_);
   drag_icon_ = NULL;
 }
 
 void LocationBarViewGtk::OnHboxSizeAllocate(GtkWidget* sender,
                                             GtkAllocation* allocation) {
   if (hbox_width_ != allocation->width) {
     hbox_width_ = allocation->width;
     UpdateEVCertificateLabelSize();
   }
@@ skipping 393 matching lines @@
 
   std::string badge_text = page_action_->GetBadgeText(tab_id);
   if (badge_text.empty())
     return FALSE;
 
   gfx::CanvasPaint canvas(event, false);
   gfx::Rect bounding_rect(widget->allocation);
   page_action_->PaintBadge(&canvas, bounding_rect, tab_id);
   return FALSE;
 }