Move more dnd related files to ui/base

views/widget/drop_target_gtk.cc

Index: views/widget/drop_target_gtk.cc
===================================================================
--- views/widget/drop_target_gtk.cc	(revision 71798)
+++ views/widget/drop_target_gtk.cc	(working copy)
@@ -9,12 +9,12 @@
 #include <string>
 #include <vector>
 
-#include "app/drag_drop_types.h"
-#include "app/gtk_dnd_util.h"
 #include "base/file_path.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/point.h"
 #include "net/base/net_util.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
+#include "ui/base/dragdrop/gtk_dnd_util.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_gtk.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_gtk.h"
@@ -143,13 +143,13 @@
   if (!data_->HasAllFormats(requested_formats_, requested_custom_formats_))
     return;  // Waiting on more data.
 
-  int drag_operation = DragDropTypes::GdkDragActionToDragOperation(
+  int drag_operation = ui::DragDropTypes::GdkDragActionToDragOperation(
       context->actions);
   gfx::Point root_view_location(x, y);
   drag_operation = helper_.OnDragOver(*data_, root_view_location,
                                       drag_operation);
   GdkDragAction gdk_action = static_cast<GdkDragAction>(
-      DragDropTypes::DragOperationToGdkDragAction(drag_operation));
+      ui::DragDropTypes::DragOperationToGdkDragAction(drag_operation));
   if (!received_drop_)
     gdk_drag_status(context, gdk_action, time);
 
@@ -224,14 +224,14 @@
     }
   }
 
-  int drag_operation = DragDropTypes::GdkDragActionToDragOperation(
+  int drag_operation = ui::DragDropTypes::GdkDragActionToDragOperation(
       context->actions);
   drag_operation = helper_.OnDragOver(*data_, root_view_location,
                                       drag_operation);
   if (!received_drop_) {
     GdkDragAction gdk_action =
         static_cast<GdkDragAction>(
-            DragDropTypes::DragOperationToGdkDragAction(drag_operation));
+            ui::DragDropTypes::DragOperationToGdkDragAction(drag_operation));
     gdk_drag_status(context, gdk_action, time);
   }
   return TRUE;
@@ -240,13 +240,13 @@
 void DropTargetGtk::FinishDrop(GdkDragContext* context,
                                gint x, gint y, guint time) {
   gfx::Point root_view_location(x, y);
-  int drag_operation = DragDropTypes::GdkDragActionToDragOperation(
+  int drag_operation = ui::DragDropTypes::GdkDragActionToDragOperation(
       context->actions);
   drag_operation = helper_.OnDrop(*data_, root_view_location,
                                   drag_operation);
   GdkDragAction gdk_action =
       static_cast<GdkDragAction>(
-          DragDropTypes::DragOperationToGdkDragAction(drag_operation));
+          ui::DragDropTypes::DragOperationToGdkDragAction(drag_operation));
   gtk_drag_finish(context, gdk_action != 0, (gdk_action & GDK_ACTION_MOVE),
                   time);