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

trunk/src/apps/launcher.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/launcher.h"
 
 #include "apps/apps_client.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 362 matching lines @@
 
 void RestartPlatformApp(Profile* profile, const Extension* extension) {
 #if defined(OS_WIN)
   // On Windows 8's single window Metro mode we can not launch platform apps.
   // In restart we are just making sure launch doesn't slip through.
   if (win8::IsSingleWindowMetroMode())
     return;
 #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);
     return;
   }
 
   extensions::ExtensionPrefs* extension_prefs = ExtensionSystem::Get(profile)->
       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);
 }
 
 void LaunchPlatformAppWithUrl(Profile* profile,
                               const Extension* extension,
                               const std::string& handler_id,
                               const GURL& url,
                               const GURL& referrer_url) {
   extensions::AppEventRouter::DispatchOnLaunchedEventWithUrl(
       profile, extension, handler_id, url, referrer_url);
 }
 
 }  // namespace apps