Merge 41876 - Revert r41803 and r41799...

chrome/browser/views/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/views/tab_contents/tab_contents_view_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 #include "app/gfx/canvas_paint.h"
@@ skipping 201 matching lines @@
 void TabContentsViewGtk::GetContainerBounds(gfx::Rect* out) const {
   GetBounds(out, false);
 
   // Callers expect the requested bounds not the actual bounds. For example,
   // during init callers expect 0x0, but Gtk layout enforces a min size of 1x1.
   out->set_width(GetNativeView()->requisition.width);
   out->set_height(GetNativeView()->requisition.height);
 }
 
 void TabContentsViewGtk::StartDragging(const WebDropData& drop_data,
-                                       WebDragOperationsMask ops,
-                                       const SkBitmap& image,
-                                       const gfx::Point& image_offset) {
-  drag_source_->StartDragging(drop_data, &last_mouse_down_,
-                              image, image_offset);
+                                       WebDragOperationsMask ops) {
+  drag_source_->StartDragging(drop_data, &last_mouse_down_);
   // TODO(snej): Make use of WebDragOperationsMask
 }
 
 void TabContentsViewGtk::SetPageTitle(const std::wstring& title) {
   // Set the window name to include the page title so it's easier to spot
   // when debugging (e.g. via xwininfo -tree).
   gfx::NativeView content_view = GetContentNativeView();
   if (content_view && content_view->window)
     gdk_window_set_title(content_view->window, WideToUTF8(title).c_str());
 }
@@ skipping 195 matching lines @@
 // not NULL, else our delegate.
 gboolean TabContentsViewGtk::OnMouseMove(GtkWidget* widget,
                                          GdkEventMotion* event) {
   if (sad_tab_ != NULL)
     WidgetGtk::OnMotionNotify(widget, event);
   else if (tab_contents()->delegate())
     tab_contents()->delegate()->ContentsMouseEvent(
         tab_contents(), views::Screen::GetCursorScreenPoint(), true);
   return FALSE;
 }