Merge 41876 - Revert r41803 and r41799...

chrome/browser/cocoa/notifications/balloon_view_host_mac.h

Index: chrome/browser/cocoa/notifications/balloon_view_host_mac.h
===================================================================
--- chrome/browser/cocoa/notifications/balloon_view_host_mac.h	(revision 42026)
+++ chrome/browser/cocoa/notifications/balloon_view_host_mac.h	(working copy)
@@ -16,10 +16,6 @@
 
 class Profile;
 class RenderViewHost;
-class SkBitmap;
-namespace gfx {
-class Point;
-}
 
 // BalloonViewHost class is a delegate to the renderer host for the HTML
 // notification.  When initialized it creates a new RenderViewHost and loads
@@ -81,9 +77,7 @@
                                  const gfx::Rect& initial_pos) {}
   virtual void ShowContextMenu(const ContextMenuParams& params) {}
   virtual void StartDragging(const WebDropData& drop_data,
-                             WebKit::WebDragOperationsMask allowed_ops,
-                             const SkBitmap& image,
-                             const gfx::Point& image_offset) {}
+                             WebKit::WebDragOperationsMask allowed_ops) {}
   virtual void UpdateDragCursor(WebKit::WebDragOperation operation) {}
   virtual void GotFocus() {}
   virtual void TakeFocus(bool reverse) {}