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, 15 insertions, 0 deletions

diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc
index 5d24596..c052790 100644
--- a/chrome/browser/browser_shutdown.cc
+++ b/chrome/browser/browser_shutdown.cc
@@ -41,6 +41,11 @@ using base::TimeDelta;
 
 namespace browser_shutdown {
 
+#if defined(OS_MACOSX)
+// Whether the browser is trying to quit (e.g., Quit chosen from menu).
+bool g_trying_to_quit = false;
+#endif  // OS_MACOSX
+
 Time shutdown_started_;
 ShutdownType shutdown_type_ = NOT_VALID;
 int shutdown_num_processes_;
@@ -226,4 +231,14 @@ void ReadLastShutdownInfo() {
           &ReadLastShutdownFile, type, num_procs, num_procs_slow));
 }
 
+#if defined(OS_MACOSX)
+void SetTryingToQuit(bool quitting) {
+  g_trying_to_quit = quitting;
+}
+
+bool IsTryingToQuit() {
+  return g_trying_to_quit;
+}
+#endif
+
 }  // namespace browser_shutdown