From a455d381543e773418e645b3192c8731430a646e Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Thu, 5 Mar 2009 20:18:07 +0000 Subject: Try #2 of "make JavaScript alerts reflect the URL of the frame they came from, not the enclosing frame." The diffrence between this one and the previous version of this patch is the addition of test_webview_delegate. BUG=1686837 Review URL: http://codereview.chromium.org/39163 Review URL: http://codereview.chromium.org/40175 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11026 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/renderer/render_view.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'chrome/renderer/render_view.h') diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index 1c0078c..700faa9 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -142,15 +142,15 @@ class RenderView : public RenderWidget, virtual void ShowModalHTMLDialog(const GURL& url, int width, int height, const std::string& json_arguments, std::string* json_retval); - virtual void RunJavaScriptAlert(WebView* webview, + virtual void RunJavaScriptAlert(WebFrame* webframe, const std::wstring& message); - virtual bool RunJavaScriptConfirm(WebView* webview, + virtual bool RunJavaScriptConfirm(WebFrame* webframe, const std::wstring& message); - virtual bool RunJavaScriptPrompt(WebView* webview, + virtual bool RunJavaScriptPrompt(WebFrame* webframe, const std::wstring& message, const std::wstring& default_value, std::wstring* result); - virtual bool RunBeforeUnloadConfirm(WebView* webview, + virtual bool RunBeforeUnloadConfirm(WebFrame* webframe, const std::wstring& message); virtual void EnableSuddenTermination(); virtual void DisableSuddenTermination(); @@ -430,6 +430,7 @@ class RenderView : public RenderWidget, bool RunJavaScriptMessage(int type, const std::wstring& message, const std::wstring& default_value, + const GURL& frame_url, std::wstring* result); // Adds search provider from the given OpenSearch description URL as a -- cgit v1.1