Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2329)

Unified Diff: apps/launcher.cc

Issue 93593003: Make clicking the restart bubble for crashed apps work. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix .count() Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « apps/app_load_service.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/launcher.cc
diff --git a/apps/launcher.cc b/apps/launcher.cc
index f8f00517d708dd41cc48835893e8e7bbce676ea0..5d526b23301381dff910cb8252b1792331d370f7 100644
--- a/apps/launcher.cc
+++ b/apps/launcher.cc
@@ -377,9 +377,12 @@ void RestartPlatformApp(Profile* profile, const Extension* extension) {
#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 =
+ events.count(app_runtime::OnRestarted::kEventName) > 0;
if (listening_to_restart) {
extensions::AppEventRouter::DispatchOnRestartedEvent(profile, extension);
@@ -390,9 +393,8 @@ void RestartPlatformApp(Profile* profile, const Extension* extension) {
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 =
+ events.count(app_runtime::OnLaunched::kEventName) > 0;
if (listening_to_launch && had_windows)
LaunchPlatformAppWithNoData(profile, extension);
« no previous file with comments | « apps/app_load_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698