Continue with crosssite navigations if alerts are suppressed...

chrome/browser/render_view_host.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/render_view_host.h"
 
 #include <string>
 #include <vector>
 
 #include "base/string_util.h"
@@ skipping 70 matching lines @@
       enable_external_host_bindings_(false),
       delegate_(delegate),
       renderer_initialized_(false),
       waiting_for_drag_context_response_(false),
       debugger_attached_(false),
       modal_dialog_count_(0),
       navigations_suspended_(false),
       suspended_nav_message_(NULL),
       run_modal_reply_msg_(NULL),
       has_unload_listener_(false),
-      is_waiting_for_unload_ack_(false) {
+      is_waiting_for_unload_ack_(false),
+      are_javascript_messages_suppressed_(false) {
   DCHECK(instance_);
   DCHECK(delegate_);
   if (modal_dialog_event == NULL)
     modal_dialog_event = CreateEvent(NULL, TRUE, FALSE, NULL);
 
   modal_dialog_event_.Set(modal_dialog_event);
 #ifdef CHROME_PERSONALIZATION
   personalization_ = Personalization::CreateHostPersonalization(this);
 #endif
 }
@@ skipping 368 matching lines @@
   Send(new ViewMsg_GetApplicationInfo(routing_id_, page_id));
 }
 
 void RenderViewHost::CaptureThumbnail() {
   Send(new ViewMsg_CaptureThumbnail(routing_id_));
 }
 
 void RenderViewHost::JavaScriptMessageBoxClosed(IPC::Message* reply_msg,
                                                 bool success,
                                                 const std::wstring& prompt) {
-  if (is_waiting_for_unload_ack_)
-    StartHangMonitorTimeout(TimeDelta::FromMilliseconds(kUnloadTimeoutMS));
+  if (is_waiting_for_unload_ack_) {
+    if (are_javascript_messages_suppressed_) {
+      delegate_->RendererUnresponsive(this, is_waiting_for_unload_ack_);
+      return;
+    } else {

[darin (slow to review), 2008/11/07 00:00:45]

nit: no need for else after return.  alternatively, you could drop the return
here.

+      StartHangMonitorTimeout(TimeDelta::FromMilliseconds(kUnloadTimeoutMS));
+    }
+  }
 
   if (--modal_dialog_count_ == 0)
     ResetEvent(modal_dialog_event_.Get());
   ViewHostMsg_RunJavaScriptMessage::WriteReplyParams(reply_msg, success, prompt);
   Send(reply_msg);
 }
 
 void RenderViewHost::ModalHTMLDialogClosed(IPC::Message* reply_msg,
                                            const std::string& json_retval) {
   if (is_waiting_for_unload_ack_)
@@ skipping 550 matching lines @@
 
 void RenderViewHost::OnMsgRunJavaScriptMessage(
     const std::wstring& message,
     const std::wstring& default_prompt,
     const int flags,
     IPC::Message* reply_msg) {
   StopHangMonitorTimeout();
   if (modal_dialog_count_++ == 0)
     SetEvent(modal_dialog_event_.Get());
   bool did_suppress_message = false;
-  delegate_->RunJavaScriptMessage(message, default_prompt, flags, reply_msg);
+  delegate_->RunJavaScriptMessage(message, default_prompt, flags, reply_msg,
+                                  &are_javascript_messages_suppressed_);
 }
 
 void RenderViewHost::OnMsgRunBeforeUnloadConfirm(const std::wstring& message,
                                                  IPC::Message* reply_msg) {
   StopHangMonitorTimeout();
   if (modal_dialog_count_++ == 0)
     SetEvent(modal_dialog_event_.Get());
   delegate_->RunBeforeUnloadConfirm(message, reply_msg);
 }
 
@@ skipping 220 matching lines @@
   Send(new ViewMsg_PersonalizationEvent(routing_id_,
                                         event_name,
                                         event_arg));
 }
 #endif
 
 void RenderViewHost::ForwardMessageFromExternalHost(
     const std::string& target, const std::string& message) {
   Send(new ViewMsg_HandleMessageFromExternalHost(routing_id_, target, message));
 }