Retry r41799:...

chrome/browser/renderer_host/render_view_host.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/renderer_host/render_view_host.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 1371 matching lines @@
     autocomplete_delegate->FormFieldValuesSubmitted(form);
 
   RenderViewHostDelegate::AutoFill* autofill_delegate =
       delegate_->GetAutoFillDelegate();
   if (autofill_delegate)
     autofill_delegate->FormFieldValuesSubmitted(form);
 }
 
 void RenderViewHost::OnMsgStartDragging(
     const WebDropData& drop_data,
-    WebDragOperationsMask drag_operations_mask) {
+    WebDragOperationsMask drag_operations_mask,
+    const SkBitmap& image,
+    const gfx::Point& image_offset) {
   RenderViewHostDelegate::View* view = delegate_->GetViewDelegate();
   if (view)
-      view->StartDragging(drop_data, drag_operations_mask);
+      view->StartDragging(drop_data, drag_operations_mask, image, image_offset);
 }
 
 void RenderViewHost::OnUpdateDragCursor(WebDragOperation current_op) {
   RenderViewHostDelegate::View* view = delegate_->GetViewDelegate();
   if (view)
     view->UpdateDragCursor(current_op);
 }
 
 void RenderViewHost::OnTakeFocus(bool reverse) {
   RenderViewHostDelegate::View* view = delegate_->GetViewDelegate();
@@ skipping 463 matching lines @@
   integration_delegate->OnPageTranslated(page_id,
                                          original_lang, translated_lang);
 }
 
 void RenderViewHost::OnContentBlocked(ContentSettingsType type) {
   RenderViewHostDelegate::Resource* resource_delegate =
       delegate_->GetResourceDelegate();
   if (resource_delegate)
     resource_delegate->OnContentBlocked(type);
 }