Move more dnd related files to ui/base

chrome/browser/ui/gtk/bookmark_menu_controller_gtk.cc

 // Copyright (c) 2011 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_menu_controller_gtk.h"
 
 #include <gtk/gtk.h>
 
-#include "app/gtk_dnd_util.h"
 #include "app/l10n_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/gtk/bookmark_utils_gtk.h"
 #include "chrome/browser/gtk/gtk_chrome_button.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/gtk/menu_gtk.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "gfx/gtk_util.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "ui/base/dragdrop/gtk_dnd_util.h"
 #include "webkit/glue/window_open_disposition.h"
 
 namespace {
 
 // TODO(estade): It might be a good idea to vary this by locale.
 const int kMaxChars = 50;
 
 void SetImageMenuItem(GtkWidget* menu_item,
                       const BookmarkNode* node,
                       BookmarkModel* model) {
@@ skipping 135 matching lines @@
     } else if (node->is_folder()) {
       GtkWidget* submenu = gtk_menu_new();
       BuildMenu(node, 0, submenu);
       gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item), submenu);
     } else {
       NOTREACHED();
     }
 
     gtk_drag_source_set(menu_item, GDK_BUTTON1_MASK, NULL, 0,
         static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_LINK));
-    int target_mask = gtk_dnd_util::CHROME_BOOKMARK_ITEM;
+    int target_mask = ui::CHROME_BOOKMARK_ITEM;
     if (node->is_url())
-      target_mask |= gtk_dnd_util::TEXT_URI_LIST | gtk_dnd_util::NETSCAPE_URL;
-    gtk_dnd_util::SetSourceTargetListFromCodeMask(menu_item, target_mask);
+      target_mask |= ui::TEXT_URI_LIST | ui::NETSCAPE_URL;
+    ui::SetSourceTargetListFromCodeMask(menu_item, target_mask);
     signals_.Connect(menu_item, "drag-begin",
                      G_CALLBACK(OnMenuItemDragBeginThunk), this);
     signals_.Connect(menu_item, "drag-end",
                      G_CALLBACK(OnMenuItemDragEndThunk), this);
     signals_.Connect(menu_item, "drag-data-get",
                      G_CALLBACK(OnMenuItemDragGetThunk), this);
 
     // It is important to connect to this signal after setting up the drag
     // source because we only want to stifle the menu's default handler and
     // not the handler that the drag source uses.
@@ skipping 171 matching lines @@
 }
 
 void BookmarkMenuController::OnMenuItemDragGet(
     GtkWidget* widget, GdkDragContext* context,
     GtkSelectionData* selection_data,
     guint target_type, guint time) {
   const BookmarkNode* node = bookmark_utils::BookmarkNodeForWidget(widget);
   bookmark_utils::WriteBookmarkToSelection(node, selection_data, target_type,
                                            profile_);
 }