Move more dnd related files to ui/base

views/widget/drop_target_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 "views/widget/drop_target_gtk.h"
 
 #include <algorithm>
 #include <iterator>
 #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"
 
 using ui::OSExchangeData;
 
 namespace {
 
 std::string GdkAtomToString(GdkAtom atom) {
   gchar* c_name = gdk_atom_name(atom);
@@ skipping 108 matching lines @@
       // Consumers of OSExchangeData will see this as an invalid URL. That is,
       // when GetURL is invoked on the OSExchangeData this triggers false to
       // be returned.
       data_provider().SetURL(GURL(), std::wstring());
     }
   }
 
   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);
 
   waiting_for_data_ = false;
 
   if (pending_view_ && received_drop_) {
     FinishDrop(context, x, y, time);
     // WARNING: we've been deleted.
     return;
   }
@@ skipping 54 matching lines @@
       // drop is valid, but we don't have all the data. Request the data
       // now. When we get back the data we'll update the target.
       RequestFormats(context, formats, custom_formats, time);
 
       waiting_for_data_ = true;
 
       return TRUE;
     }
   }
 
-  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;
 }
 
 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);
 
   static_cast<WidgetGtk*>(helper_.root_view()->GetWidget())->ResetDropTarget();
   // WARNING: we've been deleted.
 }
 
 void DropTargetGtk::IntersectFormats(int f1, const std::set<GdkAtom>& cf1,
                                      int* f2, std::set<GdkAtom>* cf2) {
   *f2 = (*f2 & f1);
@@ skipping 69 matching lines @@
       gtk_drag_get_data(widget, context, *i, time);
     }
   }
 }
 
 OSExchangeDataProviderGtk& DropTargetGtk::data_provider() const {
   return static_cast<OSExchangeDataProviderGtk&>(data_->provider());
 }
 
 }  // namespace views