More web contents dragging.

chrome/browser/gtk/bookmark_manager_gtk.cc

Index: chrome/browser/gtk/bookmark_manager_gtk.cc
===================================================================
--- chrome/browser/gtk/bookmark_manager_gtk.cc	(revision 19526)
+++ chrome/browser/gtk/bookmark_manager_gtk.cc	(working copy)
@@ -17,7 +17,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/gtk/bookmark_tree_model.h"
 #include "chrome/browser/gtk/bookmark_utils_gtk.h"
-#include "chrome/browser/gtk/dnd_registry.h"
+#include "chrome/browser/gtk/gtk_dnd_util.h"
 #include "chrome/browser/importer/importer.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/chrome_paths.h"
@@ -381,8 +381,8 @@
   // The left side is only a drag destination (not a source).
   gtk_drag_dest_set(left_tree_view_, GTK_DEST_DEFAULT_DROP,
                     NULL, 0, GDK_ACTION_MOVE);
-  dnd::SetDestTargetListFromCodeMask(left_tree_view_,
-                                     dnd::X_CHROME_BOOKMARK_ITEM);
+  GtkDndUtil::SetDestTargetListFromCodeMask(left_tree_view_,
+                                            GtkDndUtil::X_CHROME_BOOKMARK_ITEM);
 
   g_signal_connect(left_tree_view_, "drag-data-received",
                    G_CALLBACK(&OnLeftTreeViewDragReceived), this);
@@ -447,8 +447,8 @@
   gtk_drag_source_set(right_tree_view_,
                       GDK_BUTTON1_MASK,
                       NULL, 0, GDK_ACTION_MOVE);
-  dnd::SetSourceTargetListFromCodeMask(right_tree_view_,
-                                       dnd::X_CHROME_BOOKMARK_ITEM);
+  GtkDndUtil::SetSourceTargetListFromCodeMask(
+      right_tree_view_, GtkDndUtil::X_CHROME_BOOKMARK_ITEM);
 
   // We connect to drag dest signals, but we don't actually enable the widget
   // as a drag destination unless it corresponds to the contents of a folder.
@@ -533,8 +533,8 @@
 
     gtk_drag_dest_set(right_tree_view_, GTK_DEST_DEFAULT_ALL, NULL, 0,
                       GDK_ACTION_MOVE);
-    dnd::SetDestTargetListFromCodeMask(right_tree_view_,
-                                       dnd::X_CHROME_BOOKMARK_ITEM);
+    GtkDndUtil::SetDestTargetListFromCodeMask(right_tree_view_,
+                                              GtkDndUtil::X_CHROME_BOOKMARK_ITEM);
   } else {
     gtk_tree_view_column_set_visible(path_column_, TRUE);
 
@@ -1019,8 +1019,8 @@
   if (gtk_drag_check_threshold(tree_view,
       bm->mousedown_event_.x, bm->mousedown_event_.y, event->x, event->y)) {
     bm->delaying_mousedown_ = false;
-    GtkTargetList* targets =
-        dnd::GetTargetListFromCodeMask(dnd::X_CHROME_BOOKMARK_ITEM);
+    GtkTargetList* targets = GtkDndUtil::GetTargetListFromCodeMask(
+        GtkDndUtil::X_CHROME_BOOKMARK_ITEM);
     gtk_drag_begin(tree_view, targets, GDK_ACTION_MOVE,
                    1, reinterpret_cast<GdkEvent*>(event));
     // The drag adds a ref; let it own the list.