Move DragDownload() out of download_util.h

chrome/browser/download/drag_download_item_views.cc

 // Copyright (c) 2012 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/download/download_util.h"
+#include "chrome/browser/download/drag_download_item.h"
 
 #include <string>
 
 #include "content/public/browser/download_item.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_util.h"
-#include "ui/gfx/image/image.h"
-#include "ui/gfx/point.h"
-#include "url/gurl.h"
-
-#if defined(TOOLKIT_VIEWS)
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/drag_utils.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
+#include "ui/gfx/image/image.h"
+#include "ui/gfx/point.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
-#endif
-
-#if defined(TOOLKIT_GTK)
-#include "chrome/browser/ui/gtk/custom_drag.h"
-#endif  // defined(TOOLKIT_GTK)
+#include "url/gurl.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include "ui/base/dragdrop/drag_source_win.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
 #endif
 
 #if defined(USE_AURA)
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #endif
 
-namespace download_util {
-
-using content::DownloadItem;
-
-#if defined(TOOLKIT_VIEWS)
-// Download dragging
-void DragDownload(const DownloadItem* download,
-                  gfx::Image* icon,
-                  gfx::NativeView view) {
+void DragDownloadItem(const content::DownloadItem* download,
+                      gfx::Image* icon,
+                      gfx::NativeView view) {
   DCHECK(download);
-  DCHECK_EQ(DownloadItem::COMPLETE, download->GetState());
+  DCHECK_EQ(content::DownloadItem::COMPLETE, download->GetState());
 
   // Set up our OLE machinery
   ui::OSExchangeData data;
 
   if (icon) {
     drag_utils::CreateDragImageForFile(
         download->GetFileNameToReportUser(), icon->ToImageSkia(), &data);
   }
 
   const base::FilePath full_path = download->GetTargetFilePath();
@@ skipping 24 matching lines @@
       location,
       ui::DragDropTypes::DRAG_COPY | ui::DragDropTypes::DRAG_LINK,
       ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE);
 #else  // We are on WIN without AURA
   // We cannot use Widget::RunShellDrag on WIN since the |view| is backed by a
   // WebContentsViewWin, not a NativeWidgetWin.
   scoped_refptr<ui::DragSourceWin> drag_source(new ui::DragSourceWin);
   // Run the drag and drop loop
   DWORD effects;
   DoDragDrop(ui::OSExchangeDataProviderWin::GetIDataObject(data),
-             drag_source.get(), DROPEFFECT_COPY | DROPEFFECT_LINK, &effects);
+             drag_source.get(),
+             DROPEFFECT_COPY | DROPEFFECT_LINK,
+             &effects);
 #endif
 
 #else
   GtkWidget* root = gtk_widget_get_toplevel(view);
   if (!root)
     return;
 
   views::NativeWidgetGtk* widget = static_cast<views::NativeWidgetGtk*>(
       views::Widget::GetWidgetForNativeView(root)->native_widget());
   if (!widget)
     return;
 
   widget->DoDrag(data,
                  ui::DragDropTypes::DRAG_COPY | ui::DragDropTypes::DRAG_LINK);
 #endif  // TOOLKIT_GTK
 }
-#elif defined(USE_X11)
-void DragDownload(const DownloadItem* download,
-                  gfx::Image* icon,
-                  gfx::NativeView view) {
-  DownloadItemDrag::BeginDrag(download, icon);
-}
-#endif  // USE_X11
-
-}  // namespace download_util