Merge 41876 - Revert r41803 and r41799...

chrome/browser/tab_contents/tab_contents_view_gtk.cc

Index: chrome/browser/tab_contents/tab_contents_view_gtk.cc
===================================================================
--- chrome/browser/tab_contents/tab_contents_view_gtk.cc	(revision 42026)
+++ chrome/browser/tab_contents/tab_contents_view_gtk.cc	(working copy)
@@ -323,13 +323,10 @@
 // Render view DnD -------------------------------------------------------------
 
 void TabContentsViewGtk::StartDragging(const WebDropData& drop_data,
-                                       WebDragOperationsMask ops,
-                                       const SkBitmap& image,
-                                       const gfx::Point& image_offset) {
+                                       WebDragOperationsMask ops) {
   DCHECK(GetContentNativeView());
 
-  drag_source_->StartDragging(drop_data, &last_mouse_down_, image,
-                              image_offset);
+  drag_source_->StartDragging(drop_data, &last_mouse_down_);
   // TODO(snej): Make use of the WebDragOperationsMask somehow
 }