diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 17:59:23 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 17:59:23 +0000 |
| commit | e5c75e4861b7b84ffd18149ecc11934aaa159f21 (patch) | |
| tree | e8db0d59bf55d5b01e4465e1881a8c3cdc71559b /chrome/browser/tab_contents/web_contents.h | |
| parent | 8a9adb85620f16df0c223992c8a51bc3d3537158 (diff) | |
| download | chromium_src-e5c75e4861b7b84ffd18149ecc11934aaa159f21.zip chromium_src-e5c75e4861b7b84ffd18149ecc11934aaa159f21.tar.gz chromium_src-e5c75e4861b7b84ffd18149ecc11934aaa159f21.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/tab_contents/web_contents.h')
| -rw-r--r-- | chrome/browser/tab_contents/web_contents.h | 4 |
1 files changed, 3 insertions, 1 deletions
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, |