Revert r41803 and r41799

chrome/browser/tab_contents/tab_contents_view_gtk.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/tab_contents/tab_contents_view_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
@@ skipping 305 matching lines @@
   gfx::Rect bounds;
   GetContainerBounds(&bounds);
   gfx::Point point = bounds.origin();
   point.Offset(params.x, params.y);
   context_menu_->Popup(point);
 }
 
 // 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
 }
 
 // -----------------------------------------------------------------------------
 
 void TabContentsViewGtk::InsertIntoContentArea(GtkWidget* widget) {
   gtk_container_add(GTK_CONTAINER(expanded_), widget);
 }
 
 gboolean TabContentsViewGtk::OnMouseDown(GtkWidget* widget,
@@ skipping 54 matching lines @@
     gtk_container_child_set_property(GTK_CONTAINER(floating_container),
                                      widget, "x", &value);
 
     int child_y = std::max(half_view_height - (requisition.height / 2), 0);
     g_value_set_int(&value, child_y);
     gtk_container_child_set_property(GTK_CONTAINER(floating_container),
                                      widget, "y", &value);
     g_value_unset(&value);
   }
 }