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

Unified Diff: chrome/browser/extensions/extension_event_router.cc

Issue 10804020: Introduce runtime.onSuspendCanceled() event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: respond to comments Created 8 years, 5 months 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
Index: chrome/browser/extensions/extension_event_router.cc
diff --git a/chrome/browser/extensions/extension_event_router.cc b/chrome/browser/extensions/extension_event_router.cc
index 89df410adebcb0fe29bad3c8df95d869da556085..1d8100f6396bfe5888793eb8c52913e454bf1113 100644
--- a/chrome/browser/extensions/extension_event_router.cc
+++ b/chrome/browser/extensions/extension_event_router.cc
@@ -436,11 +436,16 @@ void ExtensionEventRouter::DispatchEventToProcess(
return;
}
+ // We need to call IncrementInFlightEvents() before DispatchEvent() because
+ // the former may prevent this extension from getting suspended and so send
+ // the onSuspendCanceled() to the extension, which needs to arrive before the
+ // event that DispatchEvent() is dispatching.
+ IncrementInFlightEvents(listener_profile, extension);
+
DispatchEvent(process, extension_id,
event->event_name, *event_args,
event->event_url, event->user_gesture,
event->info);
- IncrementInFlightEvents(listener_profile, extension);
}
bool ExtensionEventRouter::CanDispatchEventToProfile(

Powered by Google App Engine
This is Rietveld 408576698