Merge 41876 - Revert r41803 and r41799...

chrome/browser/chromeos/app_launcher.h

Index: chrome/browser/chromeos/app_launcher.h
===================================================================
--- chrome/browser/chromeos/app_launcher.h	(revision 42026)
+++ chrome/browser/chromeos/app_launcher.h	(working copy)
@@ -19,10 +19,8 @@
 class Browser;
 class RenderWidgetHostViewGtk;
 class SiteInstance;
-class SkBitmap;
 
 namespace gfx {
-class Point;
 class Size;
 }
 namespace views {
@@ -170,9 +168,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) {}