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

Unified Diff: extensions/browser/extension_function_dispatcher.cc

Issue 2034543002: Clear UIThreadExtensionFunction::render_frame_host_ when RFH is gone. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
« no previous file with comments | « extensions/browser/extension_function.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/extension_function_dispatcher.cc
diff --git a/extensions/browser/extension_function_dispatcher.cc b/extensions/browser/extension_function_dispatcher.cc
index 96b333cee7defb32c7c2a225c8e0d8db1c80bedd..1c57d936ad2fae1c4548b7b592b4b4cce0fa9ab1 100644
--- a/extensions/browser/extension_function_dispatcher.cc
+++ b/extensions/browser/extension_function_dispatcher.cc
@@ -491,7 +491,11 @@ void ExtensionFunctionDispatcher::DispatchWithCallbackInternal(
NOTREACHED();
return;
}
- function_ui->SetRenderFrameHost(render_frame_host);
+ if (params.embedded_worker_id != -1) {
+ function_ui->set_is_from_service_worker(true);
+ } else {
+ function_ui->SetRenderFrameHost(render_frame_host);
+ }
function_ui->set_dispatcher(AsWeakPtr());
function_ui->set_browser_context(browser_context_);
if (extension &&
« no previous file with comments | « extensions/browser/extension_function.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698