Revert r41803 and r41799

BUG=38414
TEST=none
TBR=jam

Review URL: http://codereview.chromium.org/1039006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41876 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 8 deletions

diff --git a/chrome/browser/chromeos/app_launcher.cc b/chrome/browser/chromeos/app_launcher.cc
index ea95e7a..538fae3 100644
--- a/chrome/browser/chromeos/app_launcher.cc
+++ b/chrome/browser/chromeos/app_launcher.cc
@@ -470,9 +470,7 @@ void AppLauncher::ShowCreatedWindow(int route_id,
 }
 
 void AppLauncher::StartDragging(const WebDropData& drop_data,
-                                WebKit::WebDragOperationsMask allowed_ops,
-                                const SkBitmap& image,
-                                const gfx::Point& image_offset) {
+                             WebKit::WebDragOperationsMask allowed_ops) {
   // We're not going to do any drag & drop, but we have to tell the renderer the
   // drag & drop ended, othewise the renderer thinks the drag operation is
   // underway and mouse events won't work.
diff --git a/chrome/browser/chromeos/app_launcher.h b/chrome/browser/chromeos/app_launcher.h
index f6497d8..f9fbdbc 100644
--- a/chrome/browser/chromeos/app_launcher.h
+++ b/chrome/browser/chromeos/app_launcher.h
@@ -19,10 +19,8 @@
 class Browser;
 class RenderWidgetHostViewGtk;
 class SiteInstance;
-class SkBitmap;
 
 namespace gfx {
-class Point;
 class Size;
 }
 namespace views {
@@ -170,9 +168,7 @@ class AppLauncher : public RenderViewHostDelegate,
                                  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) {}