diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 20:18:07 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 20:18:07 +0000 |
| commit | a455d381543e773418e645b3192c8731430a646e (patch) | |
| tree | f52ea9e8a6a2db06957637b8698d7c5007b2e4a5 /chrome/common | |
| parent | 2eb312b025971ee1529b3a6c67d715055cb77906 (diff) | |
| download | chromium_src-a455d381543e773418e645b3192c8731430a646e.zip chromium_src-a455d381543e773418e645b3192c8731430a646e.tar.gz chromium_src-a455d381543e773418e645b3192c8731430a646e.tar.bz2 | |
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
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/render_messages_internal.h | 6 | ||||
| -rw-r--r-- | chrome/common/temp_scaffolding_stubs.cc | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h index 963afae..db71aa2 100644 --- a/chrome/common/render_messages_internal.h +++ b/chrome/common/render_messages_internal.h @@ -755,9 +755,10 @@ IPC_BEGIN_MESSAGES(ViewHost) IPC_MESSAGE_ROUTED1(ViewHostMsg_GoToEntryAtOffset, int /* offset (from current) of history item to get */) - IPC_SYNC_MESSAGE_ROUTED3_2(ViewHostMsg_RunJavaScriptMessage, + IPC_SYNC_MESSAGE_ROUTED4_2(ViewHostMsg_RunJavaScriptMessage, std::wstring /* in - alert message */, std::wstring /* in - default prompt */, + GURL /* in - originating page URL */, int /* in - dialog flags */, bool /* out - success */, std::wstring /* out - prompt field */) @@ -1032,7 +1033,8 @@ IPC_BEGIN_MESSAGES(ViewHost) // Displays a box to confirm that the user wants to navigate away from the // page. Replies true if yes, false otherwise, the reply string is ignored, // but is included so that we can use OnJavaScriptMessageBoxClosed. - IPC_SYNC_MESSAGE_ROUTED1_2(ViewHostMsg_RunBeforeUnloadConfirm, + IPC_SYNC_MESSAGE_ROUTED2_2(ViewHostMsg_RunBeforeUnloadConfirm, + GURL, /* in - originating frame URL */ std::wstring /* in - alert message */, bool /* out - success */, std::wstring /* out - This is ignored.*/) diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc index a1727c8..d9b2477 100644 --- a/chrome/common/temp_scaffolding_stubs.cc +++ b/chrome/common/temp_scaffolding_stubs.cc @@ -427,6 +427,7 @@ bool IsPluginProcess() { //-------------------------------------------------------------------------- void RunJavascriptMessageBox(WebContents* web_contents, + const GURL& url, int dialog_flags, const std::wstring& message_text, const std::wstring& default_prompt_text, @@ -436,6 +437,7 @@ void RunJavascriptMessageBox(WebContents* web_contents, } void RunBeforeUnloadDialog(WebContents* web_contents, + const GURL& url, const std::wstring& message_text, IPC::Message* reply_msg) { NOTIMPLEMENTED(); |