Mac: reform our shutdown routine.

chrome/browser/browser.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/browser.h"
 
 #include <algorithm>
 #include <string>
 
 #include "app/animation.h"
@@ skipping 618 matching lines @@
   ProcessPendingTabs();
   return false;
 }
 
 void Browser::OnWindowClosing() {
   if (!ShouldCloseWindow())
     return;
 
   bool exiting = false;
 
-#if defined(OS_WIN) || defined(OS_LINUX)
-  // We don't want to do this on Mac since closing all windows isn't a sign
-  // that the app is shutting down.
-  if (BrowserList::size() == 1) {
+#if defined(OS_MACOSX)
+  // On Mac, closing the last window isn't usually a sign that the app is
+  // shutting down.
+  bool should_quit_if_last_browser = browser_shutdown::IsTryingToQuit();
+#else
+  bool should_quit_if_last_browser = true;
+#endif
+
+  if (should_quit_if_last_browser && BrowserList::size() == 1) {
     browser_shutdown::OnShutdownStarting(browser_shutdown::WINDOW_CLOSE);
     exiting = true;
   }
-#endif
 
   // Don't use HasSessionService here, we want to force creation of the
   // session service so that user can restore what was open.
   SessionService* session_service = profile()->GetSessionService();
   if (session_service)
     session_service->WindowClosing(session_id());
 
   TabRestoreService* tab_restore_service = profile()->GetTabRestoreService();
   if (tab_restore_service)
     tab_restore_service->BrowserClosing(this);
@@ skipping 2823 matching lines @@
   if (TabHasUnloadListener(contents)) {
     // If the page has unload listeners, then we tell the renderer to fire
     // them. Once they have fired, we'll get a message back saying whether
     // to proceed closing the page or not, which sends us back to this method
     // with the HasUnloadListener bit cleared.
     contents->render_view_host()->FirePageBeforeUnload(false);
     return true;
   }
   return false;
 }