Make clicking the restart bubble for crashed apps work.

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"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
+#include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/app_runtime/app_runtime_api.h"
 #include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h"
 #include "chrome/browser/extensions/api/file_system/file_system_api.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 347 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();
-  bool listening_to_restart = event_router->
-      ExtensionHasEventListener(extension->id(),
-                                app_runtime::OnRestarted::kEventName);
+  // 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 =
+      ContainsKey(events, std::string(app_runtime::OnRestarted::kEventName));

[tapted, 2013/12/16 03:23:17]

what's wrong with .count()? you should get an implicit conversion to std::string
that way. I think just about every other language has a set::contains(key)
function, but they didn't bother with C++ since it's equivalent to
set::count(key) (with the implicit cast to bool).

Maybe count is too old-school :p.

But also I don't mind either way - I'm really just trolling :p

[koz (OOO until 15th September), 2013/12/16 03:52:35]

Oh, but I'm old-school, too! Sort of. Java is oldschool to me. I like .count(),
especially because we can get the implicit cast on the string, but the implicit
cast with the bool gives a "performance warning", so I've had to compare to
zero.

 
   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 = event_router->
-      ExtensionHasEventListener(extension->id(),
-                                app_runtime::OnLaunched::kEventName);
+  bool listening_to_launch =
+      ContainsKey(events, std::string(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