Index: chrome/renderer/render_view.cc |
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc |
index 9f0057c17d2be87566870f73f60c7cc0e60cb9df..af6e49716cd4e85104ea6604e511073aab4e0c2c 100644 |
--- a/chrome/renderer/render_view.cc |
+++ b/chrome/renderer/render_view.cc |
@@ -1944,6 +1944,7 @@ bool RenderView::RunJavaScriptMessage(int type, |
const std::wstring& message, |
const std::wstring& default_value, |
const GURL& frame_url, |
+ const bool unload_handler_being_run, |
std::wstring* result) { |
bool success = false; |
std::wstring result_temp; |
@@ -1951,7 +1952,8 @@ bool RenderView::RunJavaScriptMessage(int type, |
result = &result_temp; |
SendAndRunNestedMessageLoop(new ViewHostMsg_RunJavaScriptMessage( |
- routing_id_, message, default_value, frame_url, type, &success, result)); |
+ routing_id_, message, default_value, frame_url, type, |
+ unload_handler_being_run, &success, result)); |
return success; |
} |
@@ -2402,6 +2404,7 @@ void RenderView::runModalAlertDialog( |
UTF16ToWideHack(message), |
std::wstring(), |
frame->url(), |
+ frame->pageDismissalEventBeingDispatched(), |
Charlie Reis
2011/03/08 02:31:56
It seems strange to me to thread a new parameter a
|
NULL); |
} |
@@ -2411,6 +2414,7 @@ bool RenderView::runModalConfirmDialog( |
UTF16ToWideHack(message), |
std::wstring(), |
frame->url(), |
+ frame->pageDismissalEventBeingDispatched(), |
NULL); |
} |
@@ -2422,6 +2426,7 @@ bool RenderView::runModalPromptDialog( |
UTF16ToWideHack(message), |
UTF16ToWideHack(default_value), |
frame->url(), |
+ frame->pageDismissalEventBeingDispatched(), |
&result); |
if (ok) |
actual_value->assign(WideToUTF16Hack(result)); |