Merge 41876 - Revert r41803 and r41799...

chrome/browser/renderer_host/render_view_host_delegate.h

 // 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.
 
 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_DELEGATE_H_
 #define CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_DELEGATE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 26 matching lines @@
 struct ViewHostMsg_FrameNavigate_Params;
 struct WebDropData;
 class WebKeyboardEvent;
 struct WebPreferences;
 
 namespace base {
 class WaitableEvent;
 }
 
 namespace gfx {
-class Point;
 class Rect;
 class Size;
 }
 
 namespace IPC {
 class Message;
 }
 
 namespace webkit_glue {
 struct FormData;
@@ skipping 54 matching lines @@
                                    const gfx::Rect& initial_pos) = 0;
 
     // A context menu should be shown, to be built using the context information
     // provided in the supplied params.
     virtual void ShowContextMenu(const ContextMenuParams& params) = 0;
 
     // The user started dragging content of the specified type within the
     // RenderView. Contextual information about the dragged content is supplied
     // by WebDropData.
     virtual void StartDragging(const WebDropData& drop_data,
-                               WebKit::WebDragOperationsMask allowed_ops,
-                               const SkBitmap& image,
-                               const gfx::Point& image_offset) = 0;
+                               WebKit::WebDragOperationsMask allowed_ops) = 0;
 
     // The page wants to update the mouse cursor during a drag & drop operation.
     // |operation| describes the current operation (none, move, copy, link.)
     virtual void UpdateDragCursor(WebKit::WebDragOperation operation) = 0;
 
     // Notification that view for this delegate got the focus.
     virtual void GotFocus() = 0;
 
     // Callback to inform the browser it should take back focus. If reverse is
     // true, it means the focus was retrieved by doing a Shift-Tab.
@@ skipping 499 matching lines @@
   virtual bool IsExternalTabContainer() const;
 
   // The RenderView has inserted one css file into page.
   virtual void DidInsertCSS() {}
 
   // A different node in the page got focused.
   virtual void FocusedNodeChanged() {}
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_DELEGATE_H_