Chrome should shut down cleanly when quit from the Dock icon menu, during...

chrome/browser/app_controller_mac.mm

 // Copyright (c) 2009 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/command_line.h"
 #include "base/mac_util.h"
 #include "base/message_loop.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_init.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/browser_window.h"
+#import "chrome/browser/chrome_application_mac.h"
 #import "chrome/browser/cocoa/about_window_controller.h"
 #import "chrome/browser/cocoa/bookmark_menu_bridge.h"
 #import "chrome/browser/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/cocoa/browser_window_controller.h"
 #import "chrome/browser/cocoa/history_menu_bridge.h"
 #import "chrome/browser/cocoa/clear_browsing_data_controller.h"
 #import "chrome/browser/cocoa/encoding_menu_controller_delegate_mac.h"
 #import "chrome/browser/cocoa/preferences_window_controller.h"
 #import "chrome/browser/cocoa/tab_strip_controller.h"
 #import "chrome/browser/cocoa/tab_window_controller.h"
@@ skipping 108 matching lines @@
     BrowserWindowController* controller =
         (BrowserWindowController*)[window->GetNativeHandle() windowController];
 
     if (![controller shouldCloseWithOpenPerTabSheets])
       return NO;
   }
 
   return YES;
 }
 
-// We do not use the normal application teardown process -- this function is
-// not called by the system but by us in |quit:|. |NSTerminateLater| is not a
-// return value that is supported by |quit:|.
 - (NSApplicationTerminateReply)applicationShouldTerminate:
     (NSApplication *)sender {
   // Do not quit if any per-tab sheets are open, as required by
   // GTMWindowSheetController.
   if (![self shouldQuitWithOpenPerTabSheets])
       return NSTerminateCancel;
 
   // Check for in-progress downloads, and prompt the user if they really want to
   // quit (and thus cancel the downloads).
   if (![self shouldQuitWithInProgressDownloads])
     return NSTerminateCancel;
 
   return NSTerminateNow;
 }
 
 // Called when the app is shutting down. Clean-up as appropriate.
 - (void)applicationWillTerminate:(NSNotification *)aNotification {
-  DCHECK(!BrowserList::HasBrowserWithProfile([self defaultProfile]));
-  if (!BrowserList::HasBrowserWithProfile([self defaultProfile])) {
-    // As we're shutting down, we need to nuke the TabRestoreService, which will
-    // start the shutdown of the NavigationControllers and allow for proper
-    // shutdown. If we don't do this chrome won't shutdown cleanly, and may end
-    // up crashing when some thread tries to use the IO thread (or another
-    // thread) that is no longer valid.
-    [self defaultProfile]->ResetTabRestoreService();
-  }
+  NSAppleEventManager* em = [NSAppleEventManager sharedAppleEventManager];
+  [em removeEventHandlerForEventClass:kInternetEventClass
+                           andEventID:kAEGetURL];
+  [em removeEventHandlerForEventClass:'WWW!'
+                           andEventID:'OURL'];
+  [em removeEventHandlerForEventClass:kCoreEventClass
+                           andEventID:kAEOpenDocuments];
+
+  // Close all the windows.
+  BrowserList::CloseAllBrowsers(true);
+
+  // On Windows, this is done in Browser::OnWindowClosing, but that's not
+  // appropriate on Mac since we don't shut down when we reach zero windows.
+  browser_shutdown::OnShutdownStarting(browser_shutdown::BROWSER_EXIT);
+
+  // 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();
 
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
+- (void)didEndMainMessageLoop {
+  DCHECK(!BrowserList::HasBrowserWithProfile([self defaultProfile]));
+  if (!BrowserList::HasBrowserWithProfile([self defaultProfile])) {
+    // As we're shutting down, we need to nuke the TabRestoreService, which
+    // will start the shutdown of the NavigationControllers and allow for
+    // proper shutdown. If we don't do this, Chrome won't shut down cleanly,
+    // and may end up crashing when some thread tries to use the IO thread (or
+    // another thread) that is no longer valid.
+    [self defaultProfile]->ResetTabRestoreService();
+  }
+}
+
 // Helper routine to get the window controller if the key window is a tabbed
 // window, or nil if not. Examples of non-tabbed windows are "about" or
 // "preferences".
 - (TabWindowController*)keyWindowTabController {
   NSWindowController* keyWindowController =
       [[[NSApplication sharedApplication] keyWindow] windowController];
   if ([keyWindowController isKindOfClass:[TabWindowController class]])
     return (TabWindowController*)keyWindowController;
 
   return nil;
@@ skipping 183 matching lines @@
 
       // User wants to exit.
       return YES;
     }
   }
 
   // No profiles or active downloads found, okay to exit.
   return YES;
 }
 
-// We can't use the standard terminate: method because it will abruptly exit
-// the app and leave things on the stack in an unfinalized state. We need to
-// post a quit message to our run loop so the stack can gracefully unwind.
-- (IBAction)quit:(id)sender {
-  if ([self applicationShouldTerminate:NSApp] == NSTerminateCancel)
-    return;
-
-  // TODO(pinkerton):
-  // since we have to roll it ourselves, ask the delegate (ourselves, really)
-  // if we should terminate. For example, we might not want to if the user
-  // has ongoing downloads or multiple windows/tabs open. However, this would
-  // require posting UI and may require spinning up another run loop to
-  // handle it. If it says to continue, post the quit message, otherwise
-  // go back to normal.
-
-  NSAppleEventManager* em = [NSAppleEventManager sharedAppleEventManager];
-  [em removeEventHandlerForEventClass:kInternetEventClass
-                           andEventID:kAEGetURL];
-  [em removeEventHandlerForEventClass:'WWW!'
-                           andEventID:'OURL'];
-  [em removeEventHandlerForEventClass:kCoreEventClass
-                           andEventID:kAEOpenDocuments];
-
-  // TODO(pinkerton): Not sure where this should live, including it here
-  // causes all sorts of asserts from the open renderers. On Windows, it
-  // lives in Browser::OnWindowClosing, but that's not appropriate on Mac
-  // since we don't shut down when we reach zero windows.
-  // browser_shutdown::OnShutdownStarting(browser_shutdown::WINDOW_CLOSE);
-
-  // Close all the windows.
-  BrowserList::CloseAllBrowsers(true);
-
-  // 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();
-}
-
 // Called to determine if we should enable the "restore tab" menu item.
 // Checks with the TabRestoreService to see if there's anything there to
 // restore and returns YES if so.
 - (BOOL)canRestoreTab {
   TabRestoreService* service = [self defaultProfile]->GetTabRestoreService();
   return service && !service->entries().empty();
 }
 
 // Called to validate menu items when there are no key windows. All the
 // items we care about have been set with the |commandDispatch:| action and
 // a target of FirstResponder in IB. If it's not one of those, let it
 // continue up the responder chain to be handled elsewhere. We pull out the
 // tag as the cross-platform constant to differentiate and dispatch the
 // various commands.
 - (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)item {
   SEL action = [item action];
   BOOL enable = NO;
   if (action == @selector(commandDispatch:)) {
     NSInteger tag = [item tag];
     if (menuState_->SupportsCommand(tag)) {
       switch (tag) {
         case IDC_RESTORE_TAB:
           enable = [self canRestoreTab];
           break;
         default:
           enable = menuState_->IsCommandEnabled(tag) ? YES : NO;
       }
     }
-  } else if (action == @selector(quit:)) {
+  } else if (action == @selector(terminate:)) {
     enable = YES;
   } else if (action == @selector(showPreferences:)) {
     enable = YES;
   } else if (action == @selector(orderFrontStandardAboutPanel:)) {
     enable = YES;
   }
   return enable;
 }
 
 // Called when the user picks a menu item when there are no key windows. Calls
@@ skipping 229 matching lines @@
                                      action:@selector(commandDispatch:)
                               keyEquivalent:@""] autorelease];
   [item setTarget:self];
   [item setTag:IDC_NEW_INCOGNITO_WINDOW];
   [result addItem:item];
 
   return result;
 }
 
 @end