diff options
Diffstat (limited to 'chrome/renderer/render_view.cc')
-rw-r--r-- | chrome/renderer/render_view.cc | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index ac29d7e..debff4dc 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -1660,46 +1660,42 @@ class MessageBoxView { }; #endif -void RenderView::RunJavaScriptAlert(WebFrame* webframe, +void RenderView::RunJavaScriptAlert(WebView* webview, const std::wstring& message) { RunJavaScriptMessage(MessageBoxView::kIsJavascriptAlert, message, std::wstring(), - webframe->GetURL(), NULL); } -bool RenderView::RunJavaScriptConfirm(WebFrame* webframe, +bool RenderView::RunJavaScriptConfirm(WebView* webview, const std::wstring& message) { return RunJavaScriptMessage(MessageBoxView::kIsJavascriptConfirm, message, std::wstring(), - webframe->GetURL(), NULL); } -bool RenderView::RunJavaScriptPrompt(WebFrame* webframe, +bool RenderView::RunJavaScriptPrompt(WebView* webview, const std::wstring& message, const std::wstring& default_value, std::wstring* result) { return RunJavaScriptMessage(MessageBoxView::kIsJavascriptPrompt, message, default_value, - webframe->GetURL(), result); } bool RenderView::RunJavaScriptMessage(int type, const std::wstring& message, const std::wstring& default_value, - const GURL& frame_url, std::wstring* result) { bool success = false; std::wstring result_temp; if (!result) result = &result_temp; IPC::SyncMessage* msg = new ViewHostMsg_RunJavaScriptMessage( - routing_id_, message, default_value, frame_url, type, &success, result); + routing_id_, message, default_value, type, &success, result); msg->set_pump_messages_event(modal_dialog_event_.get()); Send(msg); @@ -1713,14 +1709,14 @@ void RenderView::AddGURLSearchProvider(const GURL& osd_url, bool autodetected) { autodetected)); } -bool RenderView::RunBeforeUnloadConfirm(WebFrame* webframe, +bool RenderView::RunBeforeUnloadConfirm(WebView* webview, const std::wstring& message) { bool success = false; // This is an ignored return value, but is included so we can accept the same // response as RunJavaScriptMessage. std::wstring ignored_result; IPC::SyncMessage* msg = new ViewHostMsg_RunBeforeUnloadConfirm( - routing_id_, webframe->GetURL(), message, &success, &ignored_result); + routing_id_, message, &success, &ignored_result); msg->set_pump_messages_event(modal_dialog_event_.get()); Send(msg); |