Move more dnd related files to ui/base

BUG=none
TEST=none
TBR=brettw

Review URL: http://codereview.chromium.org/6250014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71828 0039d316-1c4b-4281-b951-d872f2087c98

14 files changed, 59 insertions, 68 deletions

diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc
index 1f2ca9f..10220d5 100644
--- a/views/controls/button/menu_button.cc
+++ b/views/controls/button/menu_button.cc
@@ -4,13 +4,13 @@
 
 #include "views/controls/button/menu_button.h"
 
-#include "app/drag_drop_types.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas.h"
 #include "grit/app_strings.h"
 #include "grit/app_resources.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
 #include "views/controls/button/button.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/event.h"
@@ -193,7 +193,7 @@ bool MenuButton::OnMousePressed(const MouseEvent& e) {
     // If we're draggable (GetDragOperations returns a non-zero value), then
     // don't pop on press, instead wait for release.
     if (e.IsOnlyLeftMouseButton() && HitTest(e.location()) &&
-        GetDragOperations(e.location()) == DragDropTypes::DRAG_NONE) {
+        GetDragOperations(e.location()) == ui::DragDropTypes::DRAG_NONE) {
       TimeDelta delta = Time::Now() - menu_closed_time_;
       int64 delta_in_milliseconds = delta.InMilliseconds();
       if (delta_in_milliseconds > kMinimumTimeBetweenButtonClicks) {
@@ -210,7 +210,7 @@ void MenuButton::OnMouseReleased(const MouseEvent& e,
   // !IsTriggerableEvent it could lead to a situation where we end up showing
   // the menu and context menu (this would happen if the right button is not
   // triggerable and there's a context menu).
-  if (GetDragOperations(e.location()) != DragDropTypes::DRAG_NONE &&
+  if (GetDragOperations(e.location()) != ui::DragDropTypes::DRAG_NONE &&
       state() != BS_DISABLED && !canceled && !InDrag() &&
       e.IsOnlyLeftMouseButton() && HitTest(e.location())) {
     Activate();
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
index e43890a..543e48c 100644
--- a/views/controls/menu/menu_controller.cc
+++ b/views/controls/menu/menu_controller.cc
@@ -617,7 +617,7 @@ int MenuController::OnDragUpdated(SubmenuView* source,
       over_empty_menu = true;
   }
   MenuDelegate::DropPosition drop_position = MenuDelegate::DROP_NONE;
-  int drop_operation = DragDropTypes::DRAG_NONE;
+  int drop_operation = ui::DragDropTypes::DRAG_NONE;
   if (menu_item) {
     gfx::Point menu_item_loc(event.location());
     View::ConvertPointToView(source, menu_item, &menu_item_loc);
@@ -645,7 +645,7 @@ int MenuController::OnDragUpdated(SubmenuView* source,
                  SELECTION_DEFAULT);
 
     if (drop_position == MenuDelegate::DROP_NONE ||
-        drop_operation == DragDropTypes::DRAG_NONE)
+        drop_operation == ui::DragDropTypes::DRAG_NONE)
       menu_item = NULL;
   } else {
     SetSelection(source->GetMenuItem(), SELECTION_OPEN_SUBMENU);
diff --git a/views/controls/menu/menu_delegate.h b/views/controls/menu/menu_delegate.h
index d24ef81..d0a42b3 100644
--- a/views/controls/menu/menu_delegate.h
+++ b/views/controls/menu/menu_delegate.h
@@ -9,8 +9,8 @@
 #include <set>
 #include <string>
 
-#include "app/drag_drop_types.h"
 #include "base/logging.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "views/controls/menu/controller.h"
 #include "views/controls/menu/menu_item_view.h"
@@ -151,24 +151,24 @@ class MenuDelegate : Controller {
   // is set based on the location of the mouse, reset to specify a different
   // position.
   //
-  // If a drop should not be allowed, returned DragDropTypes::DRAG_NONE.
+  // If a drop should not be allowed, returned ui::DragDropTypes::DRAG_NONE.
   virtual int GetDropOperation(MenuItemView* item,
                                const DropTargetEvent& event,
                                DropPosition* position) {
     NOTREACHED() << "If you override CanDrop, you need to override this too";
-    return DragDropTypes::DRAG_NONE;
+    return ui::DragDropTypes::DRAG_NONE;
   }
 
   // Invoked to perform the drop operation. This is ONLY invoked if
   // canDrop returned true for the parent menu item, and GetDropOperation
-  // returned an operation other than DragDropTypes::DRAG_NONE.
+  // returned an operation other than ui::DragDropTypes::DRAG_NONE.
   //
   // menu indicates the menu the drop occurred on.
   virtual int OnPerformDrop(MenuItemView* menu,
                             DropPosition position,
                             const DropTargetEvent& event) {
     NOTREACHED() << "If you override CanDrop, you need to override this too";
-    return DragDropTypes::DRAG_NONE;
+    return ui::DragDropTypes::DRAG_NONE;
   }
 
   // Invoked to determine if it is possible for the user to drag the specified
diff --git a/views/controls/menu/menu_scroll_view_container.cc b/views/controls/menu/menu_scroll_view_container.cc
index 2a3cc5e..6cdd158 100644
--- a/views/controls/menu/menu_scroll_view_container.cc
+++ b/views/controls/menu/menu_scroll_view_container.cc
@@ -67,7 +67,7 @@ class MenuScrollButton : public View {
   }
 
   virtual int OnDragUpdated(const DropTargetEvent& event) {
-    return DragDropTypes::DRAG_NONE;
+    return ui::DragDropTypes::DRAG_NONE;
   }
 
   virtual void OnDragExited() {
@@ -76,7 +76,7 @@ class MenuScrollButton : public View {
   }
 
   virtual int OnPerformDrop(const DropTargetEvent& event) {
-    return DragDropTypes::DRAG_NONE;
+    return ui::DragDropTypes::DRAG_NONE;
   }
 
   virtual void Paint(gfx::Canvas* canvas) {
diff --git a/views/event.h b/views/event.h
index 4dd1ed1..3815886 100644
--- a/views/event.h
+++ b/views/event.h
@@ -442,7 +442,7 @@ class DropTargetEvent : public LocatedEvent {
   // Data associated with the drag/drop session.
   const OSExchangeData& GetData() const { return data_; }
 
-  // Bitmask of supported DragDropTypes::DragOperation by the source.
+  // Bitmask of supported ui::DragDropTypes::DragOperation by the source.
   int GetSourceOperations() const { return source_operations_; }
 
  private:
diff --git a/views/view.cc b/views/view.cc
index 8c483ae..241d86e 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -9,13 +9,13 @@
 #include <iostream>
 #endif
 
-#include "app/drag_drop_types.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/path.h"
 #include "third_party/skia/include/core/SkShader.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
 #include "views/background.h"
 #include "views/layout_manager.h"
 #include "views/views_delegate.h"
@@ -497,7 +497,7 @@ bool View::ProcessMousePressed(const MouseEvent& e, DragInfo* drag_info) {
   if (!enabled)
     return result;
 
-  if (drag_operations != DragDropTypes::DRAG_NONE) {
+  if (drag_operations != ui::DragDropTypes::DRAG_NONE) {
     drag_info->PossibleDrag(e.location());
     return true;
   }
@@ -606,7 +606,7 @@ void View::RemoveAllChildViews(bool delete_views) {
 
 void View::DoDrag(const MouseEvent& e, const gfx::Point& press_pt) {
   int drag_operations = GetDragOperations(press_pt);
-  if (drag_operations == DragDropTypes::DRAG_NONE)
+  if (drag_operations == ui::DragDropTypes::DRAG_NONE)
     return;
 
   OSExchangeData data;
@@ -1143,7 +1143,7 @@ void View::UnregisterAccelerators(bool leave_data_intact) {
 int View::GetDragOperations(const gfx::Point& press_pt) {
   return drag_controller_ ?
       drag_controller_->GetDragOperations(this, press_pt) :
-      DragDropTypes::DRAG_NONE;
+      ui::DragDropTypes::DRAG_NONE;
 }
 
 void View::WriteDragData(const gfx::Point& press_pt, OSExchangeData* data) {
@@ -1391,14 +1391,14 @@ void View::OnDragEntered(const DropTargetEvent& event) {
 }
 
 int View::OnDragUpdated(const DropTargetEvent& event) {
-  return DragDropTypes::DRAG_NONE;
+  return ui::DragDropTypes::DRAG_NONE;
 }
 
 void View::OnDragExited() {
 }
 
 int View::OnPerformDrop(const DropTargetEvent& event) {
-  return DragDropTypes::DRAG_NONE;
+  return ui::DragDropTypes::DRAG_NONE;
 }
 
 // static
diff --git a/views/view_win.cc b/views/view_win.cc
index 3ecf13b..fcdf44a 100644
--- a/views/view_win.cc
+++ b/views/view_win.cc
@@ -9,10 +9,10 @@
 #include <initguid.h>
 #include <oleacc.h>
 
-#include "app/drag_drop_types.h"
 #include "base/string_util.h"
 #include "gfx/canvas.h"
 #include "gfx/path.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
 #include "views/accessibility/view_accessibility.h"
 #include "views/border.h"
 #include "views/views_delegate.h"
diff --git a/views/widget/drop_helper.cc b/views/widget/drop_helper.cc
index 19b70b71..f15134b 100644
--- a/views/widget/drop_helper.cc
+++ b/views/widget/drop_helper.cc
@@ -4,7 +4,7 @@
 
 #include "views/widget/drop_helper.h"
 
-#include "app/drag_drop_types.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
 #include "views/view.h"
 #include "views/widget/root_view.h"
 
@@ -53,11 +53,11 @@ int DropHelper::OnDrop(const OSExchangeData& data,
   View* drop_view = target_view_;
   deepest_view_ = target_view_ = NULL;
   if (!drop_view)
-    return DragDropTypes::DRAG_NONE;
+    return ui::DragDropTypes::DRAG_NONE;
 
-  if (drag_operation == DragDropTypes::DRAG_NONE) {
+  if (drag_operation == ui::DragDropTypes::DRAG_NONE) {
     drop_view->OnDragExited();
-    return DragDropTypes::DRAG_NONE;
+    return ui::DragDropTypes::DRAG_NONE;
   }
 
   gfx::Point view_location(root_view_location);
@@ -136,7 +136,7 @@ int DropHelper::NotifyDragOver(const OSExchangeData& data,
                                const gfx::Point& root_view_location,
                                int drag_operation) {
   if (!target_view_)
-    return DragDropTypes::DRAG_NONE;
+    return ui::DragDropTypes::DRAG_NONE;
 
   gfx::Point target_view_location(root_view_location);
   View::ConvertPointToView(root_view_, target_view_, &target_view_location);
diff --git a/views/widget/drop_target_gtk.cc b/views/widget/drop_target_gtk.cc
index 75468ec..fb8dafb 100644
--- a/views/widget/drop_target_gtk.cc
+++ b/views/widget/drop_target_gtk.cc
@@ -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"
@@ -47,11 +47,9 @@ int CalculateTypes(GList* targets, std::set<GdkAtom>* type_set) {
     type_set->insert(atom);
     if (atom == GDK_TARGET_STRING) {
       types |= OSExchangeData::STRING;
-    } else if (atom == gtk_dnd_util::GetAtomForTarget(
-                   gtk_dnd_util::CHROME_NAMED_URL)) {
+    } else if (atom == ui::GetAtomForTarget(ui::CHROME_NAMED_URL)) {
       types |= OSExchangeData::URL;
-    } else if (atom == gtk_dnd_util::GetAtomForTarget(
-                   gtk_dnd_util::TEXT_URI_LIST)) {
+    } else if (atom == ui::GetAtomForTarget(ui::TEXT_URI_LIST)) {
       // TEXT_URI_LIST is used for files as well as urls.
       types |= OSExchangeData::URL | OSExchangeData::FILE_NAME;
     } else {
@@ -113,16 +111,14 @@ void DropTargetGtk::OnDragDataReceived(GdkDragContext* context,
     if (data->length > 0)
       result = Pickle(reinterpret_cast<char*>(data->data), data->length);
     data_provider().SetPickledData(data->type, result);
-  } else if (data->type == gtk_dnd_util::GetAtomForTarget(
-                 gtk_dnd_util::CHROME_NAMED_URL)) {
+  } else if (data->type == ui::GetAtomForTarget(ui::CHROME_NAMED_URL)) {
     GURL url;
     string16 title;
-    gtk_dnd_util::ExtractNamedURL(data, &url, &title);
+    ui::ExtractNamedURL(data, &url, &title);
     data_provider().SetURL(url, UTF16ToWideHack(title));
-  } else if (data->type == gtk_dnd_util::GetAtomForTarget(
-                 gtk_dnd_util::TEXT_URI_LIST)) {
+  } else if (data->type == ui::GetAtomForTarget(ui::TEXT_URI_LIST)) {
     std::vector<GURL> urls;
-    gtk_dnd_util::ExtractURIList(data, &urls);
+    ui::ExtractURIList(data, &urls);
     if (urls.size() == 1 && urls[0].is_valid()) {
       data_provider().SetURL(urls[0], std::wstring());
 
@@ -143,13 +139,13 @@ void DropTargetGtk::OnDragDataReceived(GdkDragContext* context,
   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 +220,14 @@ gboolean DropTargetGtk::OnDragMotion(GdkDragContext* context,
     }
   }
 
-  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 +236,13 @@ gboolean DropTargetGtk::OnDragMotion(GdkDragContext* context,
 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);
 
@@ -301,25 +297,20 @@ void DropTargetGtk::RequestFormats(GdkDragContext* context,
   if ((formats & OSExchangeData::URL) != 0 &&
       (requested_formats_ & OSExchangeData::URL) == 0) {
     requested_formats_ |= OSExchangeData::URL;
-    if (known_formats.count(
-            gtk_dnd_util::GetAtomForTarget(gtk_dnd_util::CHROME_NAMED_URL))) {
+    if (known_formats.count(ui::GetAtomForTarget(ui::CHROME_NAMED_URL))) {
       gtk_drag_get_data(widget, context,
-                        gtk_dnd_util::GetAtomForTarget(
-                            gtk_dnd_util::CHROME_NAMED_URL), time);
+                        ui::GetAtomForTarget(ui::CHROME_NAMED_URL), time);
     } else if (known_formats.count(
-                   gtk_dnd_util::GetAtomForTarget(
-                       gtk_dnd_util::TEXT_URI_LIST))) {
+                   ui::GetAtomForTarget(ui::TEXT_URI_LIST))) {
       gtk_drag_get_data(widget, context,
-                        gtk_dnd_util::GetAtomForTarget(
-                            gtk_dnd_util::TEXT_URI_LIST), time);
+                        ui::GetAtomForTarget(ui::TEXT_URI_LIST), time);
     }
   }
   if (((formats & OSExchangeData::FILE_NAME) != 0) &&
       (requested_formats_ & OSExchangeData::FILE_NAME) == 0) {
     requested_formats_ |= OSExchangeData::FILE_NAME;
     gtk_drag_get_data(widget, context,
-                      gtk_dnd_util::GetAtomForTarget(
-                          gtk_dnd_util::TEXT_URI_LIST), time);
+                      ui::GetAtomForTarget(ui::TEXT_URI_LIST), time);
   }
   for (std::set<GdkAtom>::const_iterator i = custom_formats.begin();
        i != custom_formats.end(); ++i) {
diff --git a/views/widget/drop_target_win.cc b/views/widget/drop_target_win.cc
index eb5151d..fa49d97 100644
--- a/views/widget/drop_target_win.cc
+++ b/views/widget/drop_target_win.cc
@@ -4,8 +4,8 @@
 
 #include "views/widget/drop_target_win.h"
 
-#include "app/drag_drop_types.h"
 #include "gfx/point.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
 #include "views/widget/root_view.h"
@@ -17,7 +17,7 @@ using ui::OSExchangeDataProviderWin;
 namespace views {
 
 DropTargetWin::DropTargetWin(RootView* root_view)
-    : app::win::DropTarget(root_view->GetWidget()->GetNativeView()),
+    : ui::DropTarget(root_view->GetWidget()->GetNativeView()),
       helper_(root_view) {
 }
 
@@ -37,8 +37,8 @@ DWORD DropTargetWin::OnDragOver(IDataObject* data_object,
   OSExchangeData data(new OSExchangeDataProviderWin(data_object));
   int drop_operation =
       helper_.OnDragOver(data, root_view_location,
-                         DragDropTypes::DropEffectToDragOperation(effect));
-  return DragDropTypes::DragOperationToDropEffect(drop_operation);
+                         ui::DragDropTypes::DropEffectToDragOperation(effect));
+  return ui::DragDropTypes::DragOperationToDropEffect(drop_operation);
 }
 
 void DropTargetWin::OnDragLeave(IDataObject* data_object) {
@@ -53,11 +53,11 @@ DWORD DropTargetWin::OnDrop(IDataObject* data_object,
   View::ConvertPointToView(NULL, helper_.root_view(), &root_view_location);
 
   OSExchangeData data(new OSExchangeDataProviderWin(data_object));
-  int drop_operation = DragDropTypes::DropEffectToDragOperation(effect);
+  int drop_operation = ui::DragDropTypes::DropEffectToDragOperation(effect);
   drop_operation = helper_.OnDragOver(data, root_view_location,
                                       drop_operation);
   drop_operation = helper_.OnDrop(data, root_view_location, drop_operation);
-  return DragDropTypes::DragOperationToDropEffect(drop_operation);
+  return ui::DragDropTypes::DragOperationToDropEffect(drop_operation);
 }
 
 }  // namespace views
diff --git a/views/widget/drop_target_win.h b/views/widget/drop_target_win.h
index 75884ac..05ece15 100644
--- a/views/widget/drop_target_win.h
+++ b/views/widget/drop_target_win.h
@@ -6,7 +6,7 @@
 #define VIEWS_WIDGET_DROP_TARGET_WIN_H_
 #pragma once
 
-#include "app/win/drop_target.h"
+#include "ui/base/dragdrop/drop_target.h"
 #include "views/widget/drop_helper.h"
 
 namespace views {
@@ -19,7 +19,7 @@ class View;
 //
 // DropTargetWin uses DropHelper to manage the appropriate view to target
 // drop messages at.
-class DropTargetWin : public app::win::DropTarget {
+class DropTargetWin : public ui::DropTarget {
  public:
   explicit DropTargetWin(RootView* root_view);
   virtual ~DropTargetWin();
diff --git a/views/widget/root_view.cc b/views/widget/root_view.cc
index 3106e33..1f419eb 100644
--- a/views/widget/root_view.cc
+++ b/views/widget/root_view.cc
@@ -6,10 +6,10 @@
 
 #include <algorithm>
 
-#include "app/drag_drop_types.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "gfx/canvas_skia.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "views/fill_layout.h"
 #include "views/focus/view_storage.h"
diff --git a/views/widget/root_view_win.cc b/views/widget/root_view_win.cc
index 714afc2..e9e858d 100644
--- a/views/widget/root_view_win.cc
+++ b/views/widget/root_view_win.cc
@@ -4,9 +4,9 @@
 
 #include "views/widget/root_view.h"
 
-#include "app/drag_drop_types.h"
-#include "app/win/drag_source.h"
 #include "gfx/canvas_skia.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
+#include "ui/base/dragdrop/drag_source.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
 
@@ -41,10 +41,10 @@ void RootView::StartDragForViewFromMouseEvent(
     int operation) {
   // NOTE: view may be null.
   drag_view_ = view;
-  scoped_refptr<app::win::DragSource> drag_source(new app::win::DragSource);
+  scoped_refptr<ui::DragSource> drag_source(new ui::DragSource);
   DWORD effects;
   DoDragDrop(OSExchangeDataProviderWin::GetIDataObject(data), drag_source,
-             DragDropTypes::DragOperationToDropEffect(operation), &effects);
+             ui::DragDropTypes::DragOperationToDropEffect(operation), &effects);
   // If the view is removed during the drag operation, drag_view_ is set to
   // NULL.
   if (view && drag_view_ == view) {
diff --git a/views/widget/widget_gtk.cc b/views/widget/widget_gtk.cc
index 784f4d5..8568da1 100644
--- a/views/widget/widget_gtk.cc
+++ b/views/widget/widget_gtk.cc
@@ -11,12 +11,12 @@
 #include <set>
 #include <vector>
 
-#include "app/drag_drop_types.h"
 #include "base/auto_reset.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/path.h"
+#include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_gtk.h"
 #include "views/widget/default_theme_provider.h"
@@ -359,7 +359,7 @@ void WidgetGtk::DoDrag(const OSExchangeData& data, int operation) {
       window_contents_,
       targets,
       static_cast<GdkDragAction>(
-          DragDropTypes::DragOperationToGdkDragAction(operation)),
+          ui::DragDropTypes::DragOperationToGdkDragAction(operation)),
       1,
       current_event);