diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 23:26:19 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 23:26:19 +0000 |
| commit | 371b8b5c52c42127c579e3d3a1b646a39176dd86 (patch) | |
| tree | c59e0be284ea984535d6b71ab9b6fabffb15de08 /chrome/browser/download/download_util.cc | |
| parent | bf02f929553ab771a209ba8eecf089ae9251a163 (diff) | |
| download | chromium_src-371b8b5c52c42127c579e3d3a1b646a39176dd86.zip chromium_src-371b8b5c52c42127c579e3d3a1b646a39176dd86.tar.gz chromium_src-371b8b5c52c42127c579e3d3a1b646a39176dd86.tar.bz2 | |
aura: Fix draggin files from downloads page. This was broken from when we
switched to WebContentsViewAura.
BUG=132221
TEST=no crash on draggin files in download manager.
Review URL: https://chromiumcodereview.appspot.com/10541150
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142017 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download/download_util.cc')
| -rw-r--r-- | chrome/browser/download/download_util.cc | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index 59aaedb..387a420 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -78,6 +78,12 @@ #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 { // Returns a string constant to be used as the |danger_type| value in @@ -407,11 +413,12 @@ void DragDownload(const DownloadItem* download, #if !defined(TOOLKIT_GTK) #if defined(USE_AURA) - views::Widget* widget = views::Widget::GetWidgetForNativeView(view); + aura::RootWindow* root_window = view->GetRootWindow(); + if (!root_window || !aura::client::GetDragDropClient(root_window)) + 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, + aura::client::GetDragDropClient(root_window)->StartDragAndDrop(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 |