summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-05 18:29:56 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-05 18:29:56 +0000
commite1f34499ce79eca58e76e9ea1bdeef2402eb4607 (patch)
tree50c640a884a0a8e14e2dfcd9d99e71f66df9100c /chrome/common
parenta023701ae0919ac47093e660bb400c6b87408460 (diff)
downloadchromium_src-e1f34499ce79eca58e76e9ea1bdeef2402eb4607.zip
chromium_src-e1f34499ce79eca58e76e9ea1bdeef2402eb4607.tar.gz
chromium_src-e1f34499ce79eca58e76e9ea1bdeef2402eb4607.tar.bz2
Reverting 11002.
Review URL: http://codereview.chromium.org/39203 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11008 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/render_messages_internal.h6
-rw-r--r--chrome/common/temp_scaffolding_stubs.cc2
2 files changed, 2 insertions, 6 deletions
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index db71aa2..963afae 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -755,10 +755,9 @@ IPC_BEGIN_MESSAGES(ViewHost)
IPC_MESSAGE_ROUTED1(ViewHostMsg_GoToEntryAtOffset,
int /* offset (from current) of history item to get */)
- IPC_SYNC_MESSAGE_ROUTED4_2(ViewHostMsg_RunJavaScriptMessage,
+ IPC_SYNC_MESSAGE_ROUTED3_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 */)
@@ -1033,8 +1032,7 @@ 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_ROUTED2_2(ViewHostMsg_RunBeforeUnloadConfirm,
- GURL, /* in - originating frame URL */
+ IPC_SYNC_MESSAGE_ROUTED1_2(ViewHostMsg_RunBeforeUnloadConfirm,
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 d9b2477..a1727c8 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -427,7 +427,6 @@ bool IsPluginProcess() {
//--------------------------------------------------------------------------
void RunJavascriptMessageBox(WebContents* web_contents,
- const GURL& url,
int dialog_flags,
const std::wstring& message_text,
const std::wstring& default_prompt_text,
@@ -437,7 +436,6 @@ void RunJavascriptMessageBox(WebContents* web_contents,
}
void RunBeforeUnloadDialog(WebContents* web_contents,
- const GURL& url,
const std::wstring& message_text,
IPC::Message* reply_msg) {
NOTIMPLEMENTED();