From e5c75e4861b7b84ffd18149ecc11934aaa159f21 Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Thu, 5 Mar 2009 17:59:23 +0000 Subject: Make JavaScript alerts reflect the URL of the frame they came from, not the enclosing frame. BUG=1686837 Review URL: http://codereview.chromium.org/39163 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11002 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/tab_contents/web_contents.cc | 10 ++++++---- chrome/browser/tab_contents/web_contents.h | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'chrome/browser/tab_contents') diff --git a/chrome/browser/tab_contents/web_contents.cc b/chrome/browser/tab_contents/web_contents.cc index 6ca0726..55c3180 100644 --- a/chrome/browser/tab_contents/web_contents.cc +++ b/chrome/browser/tab_contents/web_contents.cc @@ -1047,6 +1047,7 @@ void WebContents::RunFileChooser(bool multiple_files, void WebContents::RunJavaScriptMessage( const std::wstring& message, const std::wstring& default_prompt, + const GURL& frame_url, const int flags, IPC::Message* reply_msg, bool* did_suppress_message) { @@ -1070,18 +1071,19 @@ void WebContents::RunJavaScriptMessage( TimeDelta::FromMilliseconds(kJavascriptMessageExpectedDelay)) show_suppress_checkbox = true; - RunJavascriptMessageBox(this, flags, message, default_prompt, + RunJavascriptMessageBox(this, frame_url, flags, message, default_prompt, show_suppress_checkbox, reply_msg); } else { // If we are suppressing messages, just reply as is if the user immediately // pressed "Cancel". - OnJavaScriptMessageBoxClosed(reply_msg, false, L""); + OnJavaScriptMessageBoxClosed(reply_msg, false, std::wstring()); } } -void WebContents::RunBeforeUnloadConfirm(const std::wstring& message, +void WebContents::RunBeforeUnloadConfirm(const GURL& frame_url, + const std::wstring& message, IPC::Message* reply_msg) { - RunBeforeUnloadDialog(this, message, reply_msg); + RunBeforeUnloadDialog(this, frame_url, message, reply_msg); } void WebContents::ShowModalHTMLDialog(const GURL& url, int width, int height, diff --git a/chrome/browser/tab_contents/web_contents.h b/chrome/browser/tab_contents/web_contents.h index 110e923..e1d21de 100644 --- a/chrome/browser/tab_contents/web_contents.h +++ b/chrome/browser/tab_contents/web_contents.h @@ -344,10 +344,12 @@ class WebContents : public TabContents, const std::wstring& filter); virtual void RunJavaScriptMessage(const std::wstring& message, const std::wstring& default_prompt, + const GURL& frame_url, const int flags, IPC::Message* reply_msg, bool* did_suppress_message); - virtual void RunBeforeUnloadConfirm(const std::wstring& message, + virtual void RunBeforeUnloadConfirm(const GURL& frame_url, + const std::wstring& message, IPC::Message* reply_msg); virtual void ShowModalHTMLDialog(const GURL& url, int width, int height, const std::string& json_arguments, -- cgit v1.1