1 files changed, 5 insertions, 38 deletions
diff --git a/chromium/ui/views/drag_utils.cc b/chromium/ui/views/drag_utils.cc
index 0b9c31775a2..0fd5e5e91c8 100644
--- a/chromium/ui/views/drag_utils.cc
+++ b/chromium/ui/views/drag_utils.cc
@@ -5,26 +5,15 @@
 #include "ui/views/drag_utils.h"
 
 #include "ui/gfx/canvas.h"
-#include "ui/gfx/size.h"
-
-#if defined(USE_AURA)
-#include "ui/aura/client/drag_drop_client.h"
-#include "ui/aura/root_window.h"
-#include "ui/aura/window.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
+#include "ui/gfx/size.h"
 #include "ui/views/widget/widget.h"
-#elif defined(OS_WIN)
-#include "ui/base/dragdrop/drag_drop_types.h"
-#include "ui/base/dragdrop/drag_source_win.h"
-#include "ui/base/dragdrop/os_exchange_data_provider_win.h"
-#else
-#error
-#endif
+
+namespace {
 
 float GetDeviceScaleForNativeView(views::Widget* widget) {
   float device_scale = 1.0f;
-#if defined(USE_AURA)
   // The following code should work on other platforms as well. But we do not
   // yet care about device scale factor on other platforms. So to keep drag and
   // drop behavior on other platforms un-touched, we wrap this in the #if guard.
@@ -34,34 +23,12 @@ float GetDeviceScaleForNativeView(views::Widget* widget) {
         GetDisplayNearestWindow(view);
     device_scale = display.device_scale_factor();
   }
-#endif
   return device_scale;
 }
 
-namespace views {
+}  // namespace
 
-void RunShellDrag(gfx::NativeView view,
-                  const ui::OSExchangeData& data,
-                  const gfx::Point& location,
-                  int operation,
-                  ui::DragDropTypes::DragEventSource source) {
-#if defined(USE_AURA)
-  gfx::Point root_location(location);
-  aura::Window* root_window = view->GetRootWindow();
-  aura::Window::ConvertPointToTarget(view, root_window, &root_location);
-  if (aura::client::GetDragDropClient(root_window)) {
-    aura::client::GetDragDropClient(root_window)->StartDragAndDrop(
-        data, root_window, view, root_location, operation, source);
-  }
-#elif defined(OS_WIN)
-  scoped_refptr<ui::DragSourceWin> drag_source(new ui::DragSourceWin);
-  DWORD effects;
-  DoDragDrop(ui::OSExchangeDataProviderWin::GetIDataObject(data),
-             drag_source,
-             ui::DragDropTypes::DragOperationToDropEffect(operation),
-             &effects);
-#endif
-}
+namespace views {
 
 gfx::Canvas* GetCanvasForDragImage(views::Widget* widget,
                                    const gfx::Size& canvas_size) {