Revert 241162 "Make clicking the restart bubble for crashed apps..."

trunk/src/apps/app_load_service.cc

Index: trunk/src/apps/app_load_service.cc
===================================================================
--- trunk/src/apps/app_load_service.cc	(revision 243700)
+++ trunk/src/apps/app_load_service.cc	(working copy)
@@ -33,7 +33,7 @@
 AppLoadService::AppLoadService(Profile* profile)
     : profile_(profile) {
   registrar_.Add(
-      this, chrome::NOTIFICATION_EXTENSION_LOADED,
+      this, chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
       content::NotificationService::AllSources());
   registrar_.Add(
       this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
@@ -78,8 +78,13 @@
                              const content::NotificationSource& source,
                              const content::NotificationDetails& details) {
   switch (type) {
-    case chrome::NOTIFICATION_EXTENSION_LOADED: {
-      Extension* extension = content::Details<Extension>(details).ptr();
+    case chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING: {
+      extensions::ExtensionHost* host =
+          content::Details<extensions::ExtensionHost>(details).ptr();
+      const Extension* extension = host->extension();
+      // It is possible for an extension to be unloaded before it stops loading.
+      if (!extension)
+        break;
       std::map<std::string, PostReloadAction>::iterator it =
           post_reload_actions_.find(extension->id());
       if (it == post_reload_actions_.end())