Mac: reform our shutdown routine.

Make shutdown be more like other platforms. Moreover:
- Cancelling quit from an onbeforeunload dialog shouldn't mess up the browser.
- Having quit cancelled due to a window pop up on the closure of another window
  shouldn't break the browser. [With this patch, it will result in the browser
  being in a quirky state in which the closure of the last browser window will
  cause a quit. But the browser won't be broken.]

BUG=34384,37813,37927
TEST=See bugs.

Review URL: http://codereview.chromium.org/1520006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44096 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 0 deletions

diff --git a/chrome/browser/js_modal_dialog_mac.mm b/chrome/browser/js_modal_dialog_mac.mm
index 3bdc9aa..d15e6ad 100644
--- a/chrome/browser/js_modal_dialog_mac.mm
+++ b/chrome/browser/js_modal_dialog_mac.mm
@@ -10,6 +10,7 @@
 #include "app/message_box_flags.h"
 #import "base/cocoa_protocols_mac.h"
 #include "base/sys_string_conversions.h"
+#import "chrome/browser/chrome_browser_application_mac.h"
 #include "grit/app_strings.h"
 #include "grit/generated_resources.h"
 
@@ -68,6 +69,11 @@
       break;
     }
     case NSAlertSecondButtonReturn:  {  // Cancel
+      // If the user wants to stay on this page, stop quitting (if a quit is in
+      // progress).
+      if (bridge->is_before_unload_dialog())
+        chrome_browser_application_mac::CancelTerminate();
+
       bridge->OnCancel();
       break;
     }