More web contents dragging.

chrome/browser/gtk/bookmark_manager_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_manager_gtk.h"
 
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/thread.h"
 #include "chrome/browser/bookmarks/bookmark_html_writer.h"
 #include "chrome/browser/bookmarks/bookmark_manager.h"
 #include "chrome/browser/bookmarks/bookmark_table_model.h"
 #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"
 #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"
 #include "grit/theme_resources.h"
 
@@ skipping 343 matching lines @@
   g_signal_connect(left_tree_view_, "row-collapsed",
                    G_CALLBACK(OnLeftTreeViewRowCollapsed), this);
   g_signal_connect(left_tree_view_, "focus-in-event",
                    G_CALLBACK(OnLeftTreeViewFocusIn), this);
   g_signal_connect(left_tree_view_, "button-release-event",
                    G_CALLBACK(OnTreeViewButtonRelease), this);
 
   // 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);
   g_signal_connect(left_tree_view_, "drag-motion",
                    G_CALLBACK(&OnLeftTreeViewDragMotion), this);
 
   GtkWidget* scrolled = gtk_scrolled_window_new(NULL, NULL);
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
                                  GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
   gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled),
@@ skipping 44 matching lines @@
   g_signal_connect(right_tree_view_, "motion-notify-event",
                    G_CALLBACK(OnRightTreeViewMotion), this);
   g_signal_connect(right_tree_view_, "button-release-event",
                    G_CALLBACK(OnTreeViewButtonRelease), this);
 
   // We don't advertise GDK_ACTION_COPY, but since we don't explicitly do
   // any deleting following a succesful move, this should work.
   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.
   // See BuildRightStore().
   g_signal_connect(right_tree_view_, "drag-data-get",
                    G_CALLBACK(&OnRightTreeViewDragGet), this);
   g_signal_connect(right_tree_view_, "drag-data-received",
                    G_CALLBACK(&OnRightTreeViewDragReceived), this);
   g_signal_connect(right_tree_view_, "drag-motion",
                    G_CALLBACK(&OnRightTreeViewDragMotion), this);
@@ skipping 64 matching lines @@
   gtk_list_store_clear(right_store_);
 
   if (node) {
     gtk_tree_view_column_set_visible(path_column_, FALSE);
 
     right_tree_model_.reset(
         BookmarkTableModel::CreateBookmarkTableModelForFolder(model_, node));
 
     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);
 
     int id = GetSelectedRowID();
     if (kRecentID == id) {
       right_tree_model_.reset(
           BookmarkTableModel::CreateRecentlyBookmarkedModel(model_));
     } else {  // kSearchID == id
       search_factory_.RevokeAll();
 
@@ skipping 464 matching lines @@
 // static
 gboolean BookmarkManagerGtk::OnRightTreeViewMotion(GtkWidget* tree_view,
     GdkEventMotion* event, BookmarkManagerGtk* bm) {
   // This handler is only used for the multi-drag workaround.
   if (!bm->delaying_mousedown_)
     return FALSE;
 
   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.
     gtk_target_list_unref(targets);
   }
 
   return FALSE;
 }
 
 // static
@@ skipping 61 matching lines @@
   } else if (id == IDS_BOOKMARK_MANAGER_EXPORT_MENU) {
     if (g_browser_process->io_thread()) {
       bookmark_html_writer::WriteBookmarks(
           g_browser_process->io_thread()->message_loop(), model_,
           path.ToWStringHack());
     }
   } else {
     NOTREACHED();
   }
 }