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

chrome/browser/extensions/extension_process_manager.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/extensions/extension_process_manager.h"
 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/browsing_instance.h"
 #if defined(OS_MACOSX)
@@ skipping 33 matching lines @@
   registrar_.Add(this, NotificationType::EXTENSION_LOADED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::EXTENSION_HOST_DESTROYED,
                  Source<Profile>(profile));
   registrar_.Add(this, NotificationType::RENDERER_PROCESS_TERMINATED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::RENDERER_PROCESS_CLOSED,
                  NotificationService::AllSources());
-#if defined(OS_WIN) || defined(OS_LINUX)
-  registrar_.Add(this, NotificationType::BROWSER_CLOSED,
-                 NotificationService::AllSources());
-#elif defined(OS_MACOSX)
   registrar_.Add(this, NotificationType::APP_TERMINATING,
                  NotificationService::AllSources());
-#endif
 }
 
 ExtensionProcessManager::~ExtensionProcessManager() {
   CloseBackgroundHosts();
   DCHECK(background_hosts_.empty());
 }
 
 ExtensionHost* ExtensionProcessManager::CreateView(Extension* extension,
                                                    const GURL& url,
                                                    Browser* browser,
@@ skipping 207 matching lines @@
       background_hosts_.erase(host);
       break;
     }
 
     case NotificationType::RENDERER_PROCESS_TERMINATED:
     case NotificationType::RENDERER_PROCESS_CLOSED: {
       RenderProcessHost* host = Source<RenderProcessHost>(source).ptr();
       UnregisterExtensionProcess(host->id());
       break;
     }
-#if defined(OS_WIN) || defined(OS_LINUX)
-    case NotificationType::BROWSER_CLOSED: {
+
+    case NotificationType::APP_TERMINATING: {
       // Close background hosts when the last browser is closed so that they
       // have time to shutdown various objects on different threads. Our
       // destructor is called too late in the shutdown sequence.
-      bool app_closing = *Details<bool>(details).ptr();
-      if (app_closing)
-        CloseBackgroundHosts();
-      break;
-    }
-#elif defined(OS_MACOSX)
-    case NotificationType::APP_TERMINATING: {
       CloseBackgroundHosts();
       break;
     }
-#endif
 
     default:
       NOTREACHED();
   }
 }
 
 void ExtensionProcessManager::OnExtensionHostCreated(ExtensionHost* host,
                                                      bool is_background) {
   all_hosts_.insert(host);
   if (is_background)
     background_hosts_.insert(host);
   NotificationService::current()->Notify(
       NotificationType::EXTENSION_HOST_CREATED,
       Source<ExtensionProcessManager>(this),
       Details<ExtensionHost>(host));
 }
 
 void ExtensionProcessManager::CloseBackgroundHosts() {
   for (ExtensionHostSet::iterator iter = background_hosts_.begin();
        iter != background_hosts_.end(); ) {
     ExtensionHostSet::iterator current = iter++;
     delete *current;
   }
 }