Merge 41876 - Revert r41803 and r41799...

chrome/browser/tab_contents/tab_contents_view_mac.h

Index: chrome/browser/tab_contents/tab_contents_view_mac.h
===================================================================
--- chrome/browser/tab_contents/tab_contents_view_mac.h	(revision 42026)
+++ chrome/browser/tab_contents/tab_contents_view_mac.h	(working copy)
@@ -20,13 +20,9 @@
 class FindBarMac;
 @class FocusTracker;
 @class SadTabController;
-class SkBitmap;
 class TabContentsViewMac;
 @class WebDragSource;
 @class WebDropTarget;
-namespace gfx {
-class Point;
-}
 
 @interface TabContentsViewCocoa : BaseView {
  @private
@@ -77,9 +73,7 @@
   // Backend implementation of RenderViewHostDelegate::View.
   virtual void ShowContextMenu(const ContextMenuParams& params);
   virtual void StartDragging(const WebDropData& drop_data,
-                             WebKit::WebDragOperationsMask allowed_operations,
-                             const SkBitmap& image,
-                             const gfx::Point& image_offset);
+                             WebKit::WebDragOperationsMask allowed_operations);
   virtual void UpdateDragCursor(WebKit::WebDragOperation operation);
   virtual void GotFocus();
   virtual void TakeFocus(bool reverse);