| Index: content/browser/web_contents/web_contents_impl.cc
|
| diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
| index 01a810115cad34d45f09f089116e46209c11b174..24da1388eb4834256ff6bbc600b3e36c019dba49 100644
|
| --- a/content/browser/web_contents/web_contents_impl.cc
|
| +++ b/content/browser/web_contents/web_contents_impl.cc
|
| @@ -4159,13 +4159,12 @@ void WebContentsImpl::ShowContextMenu(RenderFrameHost* render_frame_host,
|
| context_menu_params);
|
| }
|
|
|
| -void WebContentsImpl::RunJavaScriptMessage(
|
| - RenderFrameHost* render_frame_host,
|
| - const base::string16& message,
|
| - const base::string16& default_prompt,
|
| - const GURL& frame_url,
|
| - JavaScriptMessageType javascript_message_type,
|
| - IPC::Message* reply_msg) {
|
| +void WebContentsImpl::RunJavaScriptDialog(RenderFrameHost* render_frame_host,
|
| + const base::string16& message,
|
| + const base::string16& default_prompt,
|
| + const GURL& frame_url,
|
| + JavaScriptDialogType dialog_type,
|
| + IPC::Message* reply_msg) {
|
| // Suppress JavaScript dialogs when requested. Also suppress messages when
|
| // showing an interstitial as it's shown over the previous page and we don't
|
| // want the hidden page's dialogs to interfere with the interstitial.
|
| @@ -4178,7 +4177,7 @@ void WebContentsImpl::RunJavaScriptMessage(
|
| is_showing_javascript_dialog_ = true;
|
| dialog_manager_ = delegate_->GetJavaScriptDialogManager(this);
|
| dialog_manager_->RunJavaScriptDialog(
|
| - this, frame_url, javascript_message_type, message, default_prompt,
|
| + this, frame_url, dialog_type, message, default_prompt,
|
| base::Bind(&WebContentsImpl::OnDialogClosed, base::Unretained(this),
|
| render_frame_host->GetProcess()->GetID(),
|
| render_frame_host->GetRoutingID(), reply_msg, false),
|
|
|