Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1244)

Unified Diff: content/browser/web_contents/web_contents_view_aura.cc

Issue 10174009: Plumb drag image offset WebContentsViewAura. This was somehow left out in the TabContentsViewAura r… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_view_aura.cc
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index 0d1ee8b8f7c82d56a97eb74b798d4ad65c8776d9..9ef2727d28824b5a54222ee90947cb990331947f 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));
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698