Extensions: don't send EXTENSION_PROCESS_CRASHED when the extension process i...

chrome/browser/extensions/extension_host.cc

 // Copyright (c) 2006-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.
 
 #include "chrome/browser/extensions/extension_host.h"
 
 #include <list>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 113 matching lines @@
       extension_host_type_(host_type) {
   render_view_host_ = new RenderViewHost(site_instance, this, MSG_ROUTING_NONE);
   render_view_host_->AllowBindings(BindingsPolicy::EXTENSION);
   if (enable_dom_automation_)
     render_view_host_->AllowBindings(BindingsPolicy::DOM_AUTOMATION);
 
   // Listen for when the render process' handle is available so we can add it
   // to the task manager then.
   registrar_.Add(this, NotificationType::RENDERER_PROCESS_CREATED,
                  Source<RenderProcessHost>(render_process_host()));
+  registrar_.Add(this, NotificationType::RENDERER_PROCESS_CLOSED,
+                 Source<RenderProcessHost>(render_process_host()));
 }
 
 ExtensionHost::~ExtensionHost() {
   NotificationService::current()->Notify(
       NotificationType::EXTENSION_HOST_DESTROYED,
       Source<Profile>(profile_),
       Details<ExtensionHost>(this));
   ProcessCreationQueue::get()->Remove(this);
   render_view_host_->Shutdown();  // deletes render_view_host
 }
@@ skipping 80 matching lines @@
     DCHECK(extension_->GetBackgroundPageReady());
     NavigateToURL(url_);
   } else if (type == NotificationType::BROWSER_THEME_CHANGED) {
     InsertThemeCSS();
   } else if (type == NotificationType::RENDERER_PROCESS_CREATED) {
     LOG(INFO) << "Sending EXTENSION_PROCESS_CREATED";
     NotificationService::current()->Notify(
         NotificationType::EXTENSION_PROCESS_CREATED,
         Source<Profile>(profile_),
         Details<ExtensionHost>(this));
+  } else if (type == NotificationType::RENDERER_PROCESS_CLOSED) {
+    Details<RenderProcessHost::RendererClosedDetails> closed_details =
+        static_cast<Details<RenderProcessHost::RendererClosedDetails> >(
+            details);
+    if (!closed_details->did_crash)
+      return;
+

[Matt Perry, 2009/12/11 01:54:52]

nit: add DCHECK(closed_details->was_extension_renderer) just for kicks

+    LOG(INFO) << "Sending EXTENSION_PROCESS_CRASHED for " + extension_->name();
+    NotificationService::current()->Notify(
+        NotificationType::EXTENSION_PROCESS_CRASHED,
+        Source<Profile>(profile_),
+        Details<ExtensionHost>(this));
   } else {
     NOTREACHED();
   }
 }
 
 void ExtensionHost::UpdatePreferredSize(const gfx::Size& new_size) {
   if (view_.get())
     view_->UpdatePreferredSize(new_size);
 }
 
-void ExtensionHost::RenderViewGone(RenderViewHost* render_view_host) {
-  LOG(INFO) << "Sending EXTENSION_PROCESS_CRASHED for " + extension_->name();
-  DCHECK_EQ(render_view_host_, render_view_host);
-  NotificationService::current()->Notify(
-      NotificationType::EXTENSION_PROCESS_CRASHED,
-      Source<Profile>(profile_),
-      Details<ExtensionHost>(this));
-}
-
 void ExtensionHost::DidNavigate(RenderViewHost* render_view_host,
     const ViewHostMsg_FrameNavigate_Params& params) {
   // We only care when the outer frame changes.
   switch (params.transition) {
     case PageTransition::AUTO_SUBFRAME:
     case PageTransition::MANUAL_SUBFRAME:
       return;
   }
 
   if (!params.url.SchemeIs(chrome::kExtensionScheme)) {
@@ skipping 355 matching lines @@
     // Extensions hosted in ExternalTabContainer objects may not have
     // an associated browser.
     Browser* browser = GetBrowser();
     if (browser)
       window_id = ExtensionTabUtil::GetWindowId(browser);
   } else if (extension_host_type_ != ViewType::EXTENSION_BACKGROUND_PAGE) {
     NOTREACHED();
   }
   return window_id;
 }