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, 8 insertions, 1 deletions

diff --git a/chrome/browser/chrome_browser_application_mac.h b/chrome/browser/chrome_browser_application_mac.h
index 9a1ab9e..67b4230 100644
--- a/chrome/browser/chrome_browser_application_mac.h
+++ b/chrome/browser/chrome_browser_application_mac.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -10,6 +10,10 @@
 #import "base/chrome_application_mac.h"
 
 @interface BrowserCrApplication : CrApplication
+// Our implementation of |-terminate:| only attempts to terminate the
+// application, i.e., begins a process which may lead to termination. This
+// method cancels that process.
+- (void)cancelTerminate:(id)sender;
 @end
 
 namespace chrome_browser_application_mac {
@@ -34,6 +38,9 @@ namespace chrome_browser_application_mac {
 // Calls -[NSApp terminate:].
 void Terminate();
 
+// Cancels a termination started by |Terminate()|.
+void CancelTerminate();
+
 }  // namespace chrome_browser_application_mac
 
 #endif  // CHROME_BROWSER_CHROME_BROWSER_APPLICATION_MAC_H_