Refactor shutdown code to allow win/linux to run after last browser closes.

chrome/browser/js_modal_dialog.cc

 // Copyright (c) 2010 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/js_modal_dialog.h"
 
 #include "base/string_util.h"
+#include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "ipc/ipc_message.h"
 
 namespace {
 
 // The maximum sizes of various texts passed to us from javascript.
 const int kMessageTextMaxSize = 3000;
@@ skipping 65 matching lines @@
     // EXTENSION_HOST_DESTROYED uses the Profile as its source, but we care
     // about the ExtensionHost (which is passed in the details).
     registrar_.Add(this, NotificationType::EXTENSION_HOST_DESTROYED,
                    NotificationService::AllSources());
   } else {
     NOTREACHED();
   }
 }
 
 void JavaScriptAppModalDialog::OnCancel() {
+  // If we are shutting down and this is an onbeforeunload dialog, cancel the
+  // shutdown.
+  if (is_before_unload_dialog_)
+    browser_shutdown::SetTryingToQuit(false);
+
   // We need to do this before WM_DESTROY (WindowClosing()) as any parent frame
   // will receive its activation messages before this dialog receives
   // WM_DESTROY. The parent frame would then try to activate any modal dialogs
   // that were still open in the ModalDialogQueue, which would send activation
   // back to this one. The framework should be improved to handle this, so this
   // is a temporary workaround.
   CompleteDialog();
 
   if (!skip_this_dialog_) {
     client_->OnMessageBoxClosed(reply_msg_, false, std::wstring());
@@ skipping 30 matching lines @@
 // state, destroying the host. http://crbug.com/29355
 #if !defined(OS_MACOSX)
     else if (extension_host_)
       extension_host_->OnMessageBoxClosed(reply_msg_, false, L"");
     else
       NOTREACHED();
 #endif
   }
   AppModalDialog::Cleanup();
 }