Merge 41876 - Revert r41803 and r41799...

chrome/browser/chromeos/app_launcher.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/chromeos/app_launcher.h"
 
 #include <string>
 #include <vector>
 
 #include "app/gfx/canvas.h"
@@ skipping 452 matching lines @@
                                  bool user_gesture) {
   if (disposition == NEW_POPUP) {
     pending_contents_->set_delegate(NULL);
     browser_->GetSelectedTabContents()->AddNewContents(
         pending_contents_.release(), disposition, initial_pos, user_gesture);
     Hide();
   }
 }
 
 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.
   contents_rvh_->DragSourceSystemDragEnded();
 }
 
 AppLauncher::TabContentsDelegateImpl::TabContentsDelegateImpl(
     AppLauncher* app_launcher)
     : app_launcher_(app_launcher) {
 }
 
 void AppLauncher::TabContentsDelegateImpl::OpenURLFromTab(
     TabContents* source,
     const GURL& url,
     const GURL& referrer,
     WindowOpenDisposition disposition,
     PageTransition::Type transition) {
   app_launcher_->browser_->OpenURL(url, referrer, NEW_FOREGROUND_TAB,
                                    PageTransition::LINK);
   app_launcher_->Hide();
 }
 
 }  // namespace chromeos