More web contents dragging.

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"
 #include "app/resource_bundle.h"
 #include "base/gfx/gtk_util.h"
 #include "base/pickle.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/gtk/bookmark_context_menu.h"
 #include "chrome/browser/gtk/bookmark_menu_controller_gtk.h"
 #include "chrome/browser/gtk/bookmark_tree_model.h"
 #include "chrome/browser/gtk/bookmark_utils_gtk.h"
 #include "chrome/browser/gtk/browser_window_gtk.h"
 #include "chrome/browser/gtk/custom_button.h"
-#include "chrome/browser/gtk/dnd_registry.h"
 #include "chrome/browser/gtk/gtk_chrome_button.h"
+#include "chrome/browser/gtk/gtk_dnd_util.h"
 #include "chrome/browser/gtk/nine_box.h"
 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
@@ skipping 92 matching lines @@
 
   bookmark_toolbar_.Own(gtk_toolbar_new());
   gtk_widget_set_app_paintable(bookmark_toolbar_.get(), TRUE);
   g_signal_connect(G_OBJECT(bookmark_toolbar_.get()), "expose-event",
                    G_CALLBACK(&OnToolbarExpose), this);
   gtk_box_pack_start(GTK_BOX(bookmark_hbox_.get()), bookmark_toolbar_.get(),
                      TRUE, TRUE, 0);
 
   gtk_drag_dest_set(bookmark_toolbar_.get(), GTK_DEST_DEFAULT_DROP,
                     NULL, 0, GDK_ACTION_MOVE);
-  dnd::SetDestTargetListFromCodeMask(bookmark_toolbar_.get(),
-                                     dnd::X_CHROME_BOOKMARK_ITEM);
+  GtkDndUtil::SetDestTargetListFromCodeMask(bookmark_toolbar_.get(),
+                                            GtkDndUtil::X_CHROME_BOOKMARK_ITEM);
   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);
@@ skipping 211 matching lines @@
     gtk_widget_hide(bookmark_hbox_.get());
 }
 
 GtkWidget* BookmarkBarGtk::CreateBookmarkButton(const BookmarkNode* node) {
   GtkWidget* button = gtk_chrome_button_new();
   bookmark_utils::ConfigureButtonForNode(node, model_, button);
 
   // The tool item is also a source for dragging
   gtk_drag_source_set(button, GDK_BUTTON1_MASK,
                       NULL, 0, GDK_ACTION_MOVE);
-  dnd::SetSourceTargetListFromCodeMask(button, dnd::X_CHROME_BOOKMARK_ITEM);
+  GtkDndUtil::SetSourceTargetListFromCodeMask(
+      button, GtkDndUtil::X_CHROME_BOOKMARK_ITEM);
   g_signal_connect(G_OBJECT(button), "drag-begin",
                    G_CALLBACK(&OnButtonDragBegin), this);
   g_signal_connect(G_OBJECT(button), "drag-end",
                    G_CALLBACK(&OnButtonDragEnd), this);
   g_signal_connect(G_OBJECT(button), "drag-data-get",
                    G_CALLBACK(&OnButtonDragGet), this);
   // We deliberately don't connect to "drag-data-delete" because the action of
   // moving a button will regenerate all the contents of the bookmarks bar
   // anyway.
 
@@ skipping 302 matching lines @@
 
 // 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,
-                                            dnd::X_CHROME_BOOKMARK_ITEM));
+        GDK_POINTER_TO_ATOM(g_list_nth_data(
+            context->targets, GtkDndUtil::X_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,
@@ skipping 35 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.
 }