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

chrome/browser/app_controller_mac.mm

 // 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.
 
 #import "chrome/browser/app_controller_mac.h"
 
 #include "app/l10n_util_mac.h"
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/mac_util.h"
@@ skipping 214 matching lines @@
 
 - (BOOL)tryToTerminateApplication:(NSApplication*)app {
   // Check for in-process downloads, and prompt the user if they really want
   // to quit (and thus cancel downloads). Only check if we're not already
   // shutting down, else the user might be prompted multiple times if the
   // download isn't stopped before terminate is called again.
   if (!browser_shutdown::IsTryingToQuit() &&
       ![self shouldQuitWithInProgressDownloads])
     return NO;
 
-  // Set the state to "trying to quit", so that closing all browser windows will
-  // lead to termination.
-  browser_shutdown::SetTryingToQuit(true);
-
   // TODO(viettrungluu): Remove Apple Event handlers here? (It's safe to leave
   // them in, but I'm not sure about UX; we'd also want to disable other things
   // though.) http://crbug.com/40861
 
-  if (!BrowserList::size())
-    return YES;
+  size_t num_browsers = BrowserList::size();
 
-  // Try to close all the windows.
-  BrowserList::CloseAllBrowsers(true);
+  // Initiate a shutdown (via BrowserList::CloseAllBrowsers()) if we aren't
+  // already shutting down.
+  if (!browser_shutdown::IsTryingToQuit())
+    BrowserList::CloseAllBrowsers(true);
 
-  return NO;
+  return num_browsers == 0 ? YES : NO;
 }
 
 - (void)stopTryingToTerminateApplication:(NSApplication*)app {
   if (browser_shutdown::IsTryingToQuit()) {
     // Reset the "trying to quit" state, so that closing all browser windows
     // will no longer lead to termination.
     browser_shutdown::SetTryingToQuit(false);
 
     // TODO(viettrungluu): Were we to remove Apple Event handlers above, we
     // would have to reinstall them here. http://crbug.com/40861
   }
 }
 
 // Called when the app is shutting down. Clean-up as appropriate.
 - (void)applicationWillTerminate:(NSNotification*)aNotification {
   NSAppleEventManager* em = [NSAppleEventManager sharedAppleEventManager];
   [em removeEventHandlerForEventClass:kInternetEventClass
                            andEventID:kAEGetURL];
   [em removeEventHandlerForEventClass:'WWW!'
                            andEventID:'OURL'];
 
   // There better be no browser windows left at this point.
   CHECK_EQ(BrowserList::size(), 0u);
 
-  // Release the reference to the browser process. Once all the browsers get
-  // dealloc'd, it will stop the RunLoop and fall back into main().
-  g_browser_process->ReleaseModule();
+  // Tell BrowserList not to keep the browser process alive. Once all the
+  // browsers get dealloc'd, it will stop the RunLoop and fall back into main().
+  BrowserList::EndKeepAlive();
 
   // Close these off if they have open windows.
   [prefsController_ close];
   [aboutController_ close];
 
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
 - (void)didEndMainMessageLoop {
   DCHECK(!BrowserList::HasBrowserWithProfile([self defaultProfile]));
@@ skipping 161 matching lines @@
     NSNumber* value = [NSNumber numberWithFloat:fiveHoursInSeconds];
     CFPreferencesSetAppValue(checkInterval, value, app);
     CFPreferencesAppSynchronize(app);
   }
 #endif
 }
 
 // This is called after profiles have been loaded and preferences registered.
 // It is safe to access the default profile here.
 - (void)applicationDidFinishLaunching:(NSNotification*)notify {
-  // Hold an extra ref to the BrowserProcess singleton so it doesn't go away
-  // when all the browser windows get closed. We'll release it on quit which
-  // will be the signal to exit.
-  DCHECK(g_browser_process);
-  g_browser_process->AddRefModule();
+  // Notify BrowserList to keep the application running so it doesn't go away
+  // when all the browser windows get closed.
+  BrowserList::StartKeepAlive();
 
   bookmarkMenuBridge_.reset(new BookmarkMenuBridge([self defaultProfile]));
   historyMenuBridge_.reset(new HistoryMenuBridge([self defaultProfile]));
 
   [self setUpdateCheckInterval];
 
   // Build up the encoding menu, the order of the items differs based on the
   // current locale (see http://crbug.com/7647 for details).
   // We need a valid g_browser_process to get the profile which is why we can't
   // call this from awakeFromNib.
@@ skipping 592 matching lines @@
   [appController showPreferencesWindow:nil page:page profile:profile];
 }
 
 namespace app_controller_mac {
 
 bool IsOpeningNewWindow() {
   return g_is_opening_new_window;
 }
 
 }  // namespace app_controller_mac