Merge 132127 - Fix downloads page drag/drop in WIN.

chrome/browser/download/download_util.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.
 //
 // Download utility implementation
 
 #include "chrome/browser/download/download_util.h"
 
 #if defined(OS_WIN)
 #include <shobjidl.h>
@@ skipping 379 matching lines @@
   if (mime_type.empty())
     net::GetMimeTypeFromFile(full_path, &mime_type);
 
   // Add URL so that we can load supported files when dragged to WebContents.
   if (net::IsSupportedMimeType(mime_type)) {
     data.SetURL(net::FilePathToFileURL(full_path),
                 download->GetFileNameToReportUser().LossyDisplayName());
   }
 
 #if !defined(TOOLKIT_USES_GTK)
+#if defined(USE_AURA)
   views::Widget* widget = views::Widget::GetWidgetForNativeView(view);
-  // TODO(varunjain): Widget should not be NULL here. But its causing the crash
-  // in http://code.google.com/p/chromium/issues/detail?id=120430 Find out why.
-  if (!widget || !widget->native_widget())
-    return;
-
   gfx::Point location = gfx::Screen::GetCursorScreenPoint();
   // We do not care about notifying the DragItemView on completion of drag. So
   // we pass NULL to RunShellDrag for the source view.
   widget->RunShellDrag(NULL, data, location,
       ui::DragDropTypes::DRAG_COPY | ui::DragDropTypes::DRAG_LINK);
+#else // We are on WIN without AURA
+  // We cannot use Widget::RunShellDrag on WIN since the |view| is backed by a
+  // TabContentsViewWin, not a NativeWidgetWin.
+  scoped_refptr<ui::DragSource> drag_source(new ui::DragSource);
+  // Run the drag and drop loop
+  DWORD effects;
+  DoDragDrop(ui::OSExchangeDataProviderWin::GetIDataObject(data),
+             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;
@@ skipping 220 matching lines @@
   UMA_HISTOGRAM_ENUMERATION(
       "Download.CountsChrome", type, CHROME_DOWNLOAD_COUNT_TYPES_LAST_ENTRY);
 }
 
 void RecordDownloadSource(ChromeDownloadSource source) {
   UMA_HISTOGRAM_ENUMERATION(
       "Download.SourcesChrome", source, CHROME_DOWNLOAD_SOURCE_LAST_ENTRY);
 }
 
 }  // namespace download_util