Move the NOTIFICATION_APP_TERMINATING notification from content to chrome, since it's fired by chro…

content/browser/debugger/worker_devtools_manager.cc

 // Copyright (c) 2011 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 "content/browser/debugger/worker_devtools_manager.h"
 
 #include <list>
 #include <map>
 
 #include "base/bind.h"
 #include "content/browser/debugger/devtools_agent_host.h"
 #include "content/browser/debugger/devtools_manager_impl.h"
 #include "content/browser/debugger/worker_devtools_message_filter.h"
 #include "content/browser/worker_host/worker_service_impl.h"
 #include "content/common/devtools_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/devtools_agent_host_registry.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/notification_types.h"
 #include "content/public/common/process_type.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 
 using content::BrowserThread;
 
 namespace content {
 
 // Called on the UI thread.
 // static
 DevToolsAgentHost* DevToolsAgentHostRegistry::GetDevToolsAgentHostForWorker(
     int worker_process_id,
     int worker_route_id) {
   return WorkerDevToolsManager::GetDevToolsAgentHostForWorker(
       worker_process_id,
       worker_route_id);
 }
 
-class WorkerDevToolsManager::AgentHosts
-    : private content::NotificationObserver {
+class WorkerDevToolsManager::AgentHosts {
 public:
   static void Add(WorkerId id, WorkerDevToolsAgentHost* host) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     if (!instance_)
       instance_ = new AgentHosts();
     instance_->map_[id] = host;
   }
   static void Remove(WorkerId id) {
     DCHECK(instance_);
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 11 matching lines @@
       return NULL;
     Instances& map = instance_->map_;
     Instances::iterator it = map.find(id);
     if (it == map.end())
       return NULL;
     return it->second;
   }
 
 private:
   AgentHosts() {
-    registrar_.Add(this, content::NOTIFICATION_APP_TERMINATING,
-                   content::NotificationService::AllSources());
   }
   ~AgentHosts() {}
 
-  // content::NotificationObserver implementation.
-  virtual void Observe(int type,
-                       const content::NotificationSource&,
-                       const content::NotificationDetails&) OVERRIDE;
-
   static AgentHosts* instance_;
   typedef std::map<WorkerId, WorkerDevToolsAgentHost*> Instances;
   Instances map_;
-  content::NotificationRegistrar registrar_;
 };
 
 WorkerDevToolsManager::AgentHosts*
     WorkerDevToolsManager::AgentHosts::instance_ = NULL;
 
 
 struct WorkerDevToolsManager::TerminatedInspectedWorker {
   TerminatedInspectedWorker(WorkerId id, const GURL& url, const string16& name)
       : old_worker_id(id),
         worker_url(url),
@@ skipping 129 matching lines @@
   }
 
   static DetachedClientHosts* instance_;
   typedef std::map<WorkerId, int> WorkerIdToCookieMap;
   WorkerIdToCookieMap worker_id_to_cookie_;
 };
 
 WorkerDevToolsManager::DetachedClientHosts*
     WorkerDevToolsManager::DetachedClientHosts::instance_ = NULL;
 
-
-void WorkerDevToolsManager::AgentHosts::Observe(
-    int type,
-    const content::NotificationSource&,
-    const content::NotificationDetails&) {
-  DCHECK(type == content::NOTIFICATION_APP_TERMINATING);
-  Instances copy(map_);
-  for (Instances::iterator it = copy.begin(); it != copy.end(); ++it)
-    it->second->WorkerDestroyed();
-  DCHECK(!instance_);
-}
-
 struct WorkerDevToolsManager::InspectedWorker {
   InspectedWorker(WorkerProcessHost* host, int route_id, const GURL& url,
                   const string16& name)
       : host(host),
         route_id(route_id),
         worker_url(url),
         worker_name(name) {}
   WorkerProcessHost* const host;
   int const route_id;
   GURL worker_url;
@@ skipping 229 matching lines @@
     host->WorkerDestroyed();
 }
 
 // static
 void WorkerDevToolsManager::SendResumeToWorker(const WorkerId& id) {
   if (WorkerProcessHost* process = FindWorkerProcess(id.first))
     process->Send(new DevToolsAgentMsg_ResumeWorkerContext(id.second));
 }
 
 }  // namespace