| Index: chrome/renderer/render_view.h
|
| ===================================================================
|
| --- chrome/renderer/render_view.h (revision 25321)
|
| +++ chrome/renderer/render_view.h (working copy)
|
| @@ -212,13 +212,15 @@
|
| virtual void DidFailLoadWithError(WebView* webview,
|
| const WebKit::WebURLError& error,
|
| WebKit::WebFrame* forFrame);
|
| - virtual void DidFinishDocumentLoadForFrame(WebView* webview, WebKit::WebFrame* frame);
|
| + virtual void DidFinishDocumentLoadForFrame(WebView* webview,
|
| + WebKit::WebFrame* frame);
|
| virtual bool DidLoadResourceFromMemoryCache(
|
| WebView* webview,
|
| const WebKit::WebURLRequest& request,
|
| const WebKit::WebURLResponse& response,
|
| WebKit::WebFrame* frame);
|
| - virtual void DidHandleOnloadEventsForFrame(WebView* webview, WebKit::WebFrame* frame);
|
| + virtual void DidHandleOnloadEventsForFrame(WebView* webview,
|
| + WebKit::WebFrame* frame);
|
| virtual void DidChangeLocationWithinPageForFrame(WebView* webview,
|
| WebKit::WebFrame* frame,
|
| bool is_new_navigation);
|
| @@ -296,7 +298,9 @@
|
| const std::string& security_info,
|
| const std::string& frame_charset);
|
| virtual void StartDragging(WebView* webview,
|
| - const WebKit::WebDragData& drag_data);
|
| + const WebKit::WebPoint &mouseCoords,
|
| + const WebKit::WebDragData& drag_data,
|
| + WebKit::WebDragOperationsMask operations_mask);
|
|
|
| virtual void TakeFocus(WebView* webview, bool reverse);
|
| virtual void JSOutOfMemory();
|
| @@ -459,7 +463,7 @@
|
| // c) function:DidFinishDocumentLoadForFrame. When this function is
|
| // called, that means we have got whole html page. In here we should
|
| // finally get right encoding of page.
|
| - void UpdateEncoding(WebKit::WebFrame* frame, const std::wstring& encoding_name);
|
| + void UpdateEncoding(WebKit::WebFrame* frame, const std::wstring& enc_name);
|
|
|
| // Captures the thumbnail and text contents for indexing for the given load
|
| // ID. If the view's load ID is different than the parameter, this call is
|
| @@ -535,9 +539,11 @@
|
| const webkit_glue::PasswordFormDomManager::FillData& form_data);
|
| void OnDragTargetDragEnter(const WebDropData& drop_data,
|
| const gfx::Point& client_pt,
|
| - const gfx::Point& screen_pt);
|
| + const gfx::Point& screen_pt,
|
| + WebKit::WebDragOperationsMask operations_allowed);
|
| void OnDragTargetDragOver(const gfx::Point& client_pt,
|
| - const gfx::Point& screen_pt);
|
| + const gfx::Point& screen_pt,
|
| + WebKit::WebDragOperationsMask operations_allowed);
|
| void OnDragTargetDragLeave();
|
| void OnDragTargetDrop(const gfx::Point& client_pt,
|
| const gfx::Point& screen_pt);
|
| @@ -562,7 +568,8 @@
|
|
|
| void OnDragSourceEndedOrMoved(const gfx::Point& client_point,
|
| const gfx::Point& screen_point,
|
| - bool ended, bool cancelled);
|
| + bool ended,
|
| + WebKit::WebDragOperation drag_operation);
|
| void OnDragSourceSystemDragEnded();
|
| void OnInstallMissingPlugin();
|
| void OnFileChooserResponse(const std::vector<FilePath>& file_names);
|
|
|