diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-23 23:10:24 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-23 23:10:24 +0000 |
| commit | ed308bf28af2b288a38494944e3563a508356161 (patch) | |
| tree | 3789cf127ce97f346bfd395777eabe7938ce8003 | |
| parent | e2e2875340bbece2d2ef4dd14bde39dee08c88ac (diff) | |
| download | chromium_src-ed308bf28af2b288a38494944e3563a508356161.zip chromium_src-ed308bf28af2b288a38494944e3563a508356161.tar.gz chromium_src-ed308bf28af2b288a38494944e3563a508356161.tar.bz2 | |
Plumb drag image offset WebContentsViewAura. This was somehow left out in the TabContentsViewAura renaming.
BUG=118024
TEST=none
Review URL: http://codereview.chromium.org/10174009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133559 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/web_contents/web_contents_view_aura.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc index 0d1ee8b..9ef2727 100644 --- a/content/browser/web_contents/web_contents_view_aura.cc +++ b/content/browser/web_contents/web_contents_view_aura.cc @@ -426,8 +426,10 @@ void WebContentsViewAura::StartDragging( ui::OSExchangeDataProviderAura* provider = new ui::OSExchangeDataProviderAura; PrepareDragData(drop_data, provider); - if (!image.isNull()) + if (!image.isNull()) { provider->set_drag_image(image); + provider->set_drag_image_offset(image_offset); + } ui::OSExchangeData data(provider); // takes ownership of |provider|. scoped_ptr<WebDragSourceAura> drag_source( @@ -442,7 +444,6 @@ void WebContentsViewAura::StartDragging( // initiate the drag). The location information should be carried over from // webkit. http://crbug.com/114754 gfx::Point location(root_window->last_mouse_location()); - location.Offset(-image_offset.x(), -image_offset.y()); MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current()); result_op = aura::client::GetDragDropClient(root_window)->StartDragAndDrop( data, location, ConvertFromWeb(operations)); |