Move more dnd related files to ui/base

chrome/browser/ui/gtk/browser_toolbar_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/ui/gtk/browser_toolbar_gtk.h"
 
 #include <X11/XF86keysym.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include "app/gtk_dnd_util.h"
 #include "app/l10n_util.h"
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/singleton.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/background_page_tracker.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ skipping 23 matching lines @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "gfx/canvas_skia_paint.h"
 #include "gfx/gtk_util.h"
 #include "gfx/skbitmap_operations.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "ui/base/dragdrop/gtk_dnd_util.h"
 #include "ui/base/models/accelerator_gtk.h"
 
 namespace {
 
 // Padding on left and right of the left toolbar buttons (back, forward, reload,
 // etc.).
 const int kToolbarLeftAreaPadding = 4;
 
 // Height of the toolbar in pixels (not counting padding).
 const int kToolbarHeight = 29;
@@ skipping 349 matching lines @@
   if (actions_toolbar_.get())
     actions_toolbar_->Update();
 }
 
 // BrowserToolbarGtk, private --------------------------------------------------
 
 void BrowserToolbarGtk::SetUpDragForHomeButton(bool enable) {
   if (enable) {
     gtk_drag_dest_set(home_->widget(), GTK_DEST_DEFAULT_ALL,
                       NULL, 0, GDK_ACTION_COPY);
-    static const int targets[] = { gtk_dnd_util::TEXT_PLAIN,
-                                   gtk_dnd_util::TEXT_URI_LIST, -1 };
-    gtk_dnd_util::SetDestTargetList(home_->widget(), targets);
+    static const int targets[] = { ui::TEXT_PLAIN, ui::TEXT_URI_LIST, -1 };
+    ui::SetDestTargetList(home_->widget(), targets);
 
     drop_handler_.reset(new GtkSignalRegistrar());
     drop_handler_->Connect(home_->widget(), "drag-data-received",
                            G_CALLBACK(OnDragDataReceivedThunk), this);
   } else {
     gtk_drag_dest_unset(home_->widget());
     drop_handler_.reset(NULL);
   }
 }
 
@@ skipping 155 matching lines @@
 
   wrench_menu_button_->SetPaintOverride(GTK_STATE_ACTIVE);
   wrench_menu_->Popup(button, reinterpret_cast<GdkEvent*>(event));
 
   return TRUE;
 }
 
 void BrowserToolbarGtk::OnDragDataReceived(GtkWidget* widget,
     GdkDragContext* drag_context, gint x, gint y,
     GtkSelectionData* data, guint info, guint time) {
-  if (info != gtk_dnd_util::TEXT_PLAIN) {
+  if (info != ui::TEXT_PLAIN) {
     NOTIMPLEMENTED() << "Only support plain text drops for now, sorry!";
     return;
   }
 
   GURL url(reinterpret_cast<char*>(data->data));
   if (!url.is_valid())
     return;
 
   bool url_is_newtab = url.spec() == chrome::kChromeUINewTabURL;
   home_page_is_new_tab_page_.SetValue(url_is_newtab);
@@ skipping 39 matching lines @@
   int x_offset = base::i18n::IsRTL() ? 0 :
       sender->allocation.width - badge->width();
   int y_offset = 0;
   canvas.DrawBitmapInt(
       *badge,
       sender->allocation.x + x_offset,
       sender->allocation.y + y_offset);
 
   return FALSE;
 }