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

trunk/src/apps/app_load_service.cc

 // Copyright 2013 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 "apps/app_load_service.h"
 
 #include "apps/app_load_service_factory.h"
 #include "apps/launcher.h"
 #include "apps/shell_window_registry.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 15 matching lines @@
 namespace apps {
 
 AppLoadService::PostReloadAction::PostReloadAction()
     : action_type(LAUNCH),
       command_line(CommandLine::NO_PROGRAM) {
 }
 
 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,
       content::NotificationService::AllSources());
 }
 
 AppLoadService::~AppLoadService() {}
 
 void AppLoadService::RestartApplication(const std::string& extension_id) {
   post_reload_actions_[extension_id].action_type = RESTART;
@@ skipping 24 matching lines @@
 
 // static
 AppLoadService* AppLoadService::Get(Profile* profile) {
   return apps::AppLoadServiceFactory::GetForProfile(profile);
 }
 
 void AppLoadService::Observe(int type,
                              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())
         break;
 
       switch (it->second.action_type) {
         case LAUNCH:
           LaunchPlatformApp(profile_, extension);
           break;
         case RESTART:
@@ skipping 42 matching lines @@
         Extension::DISABLE_RELOAD) != 0;
   }
   return false;
 }
 
 bool AppLoadService::HasPostReloadAction(const std::string& extension_id) {
   return post_reload_actions_.find(extension_id) != post_reload_actions_.end();
 }
 
 }  // namespace apps