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

trunk/src/apps/launcher.cc

Index: trunk/src/apps/launcher.cc
===================================================================
--- trunk/src/apps/launcher.cc	(revision 243700)
+++ trunk/src/apps/launcher.cc	(working copy)
@@ -380,12 +380,9 @@
 #endif
   extensions::EventRouter* event_router =
       ExtensionSystem::Get(profile)->event_router();
-  // We check for registered events, rather than listeners, because listeners
-  // may not be instantiated for the events yet.
-  std::set<std::string> events =
-      event_router->GetRegisteredEvents(extension->id());
-  bool listening_to_restart =
-      events.count(app_runtime::OnRestarted::kEventName) > 0;
+  bool listening_to_restart = event_router->
+      ExtensionHasEventListener(extension->id(),
+                                app_runtime::OnRestarted::kEventName);
 
   if (listening_to_restart) {
     extensions::AppEventRouter::DispatchOnRestartedEvent(profile, extension);
@@ -396,8 +393,9 @@
       extension_service()->extension_prefs();
   bool had_windows = extension_prefs->IsActive(extension->id());
   extension_prefs->SetIsActive(extension->id(), false);
-  bool listening_to_launch =
-      events.count(app_runtime::OnLaunched::kEventName) > 0;
+  bool listening_to_launch = event_router->
+      ExtensionHasEventListener(extension->id(),
+                                app_runtime::OnLaunched::kEventName);
 
   if (listening_to_launch && had_windows)
     LaunchPlatformAppWithNoData(profile, extension);