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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1827473002: Make the process-wide ServiceRegistry available to JS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 | « content/renderer/mojo/service_registry_js_wrapper.cc ('k') | content/test/data/web_ui_mojo.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index a41cdb260b8e4372543204bdd996cae5d36ee182..2465688f7839e122b14e327ac2ef20eb71253ffe 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2320,9 +2320,14 @@ void RenderFrameImpl::EnsureMojoBuiltinsAreAvailable(
registry->AddBuiltinModule(isolate, mojo::edk::js::Support::kModuleName,
mojo::edk::js::Support::GetModule(isolate));
registry->AddBuiltinModule(
- isolate, ServiceRegistryJsWrapper::kModuleName,
+ isolate, ServiceRegistryJsWrapper::kPerFrameModuleName,
ServiceRegistryJsWrapper::Create(isolate, context, &service_registry_)
.ToV8());
+ registry->AddBuiltinModule(
+ isolate, ServiceRegistryJsWrapper::kPerProcessModuleName,
+ ServiceRegistryJsWrapper::Create(
+ isolate, context, RenderThread::Get()->GetServiceRegistry())
+ .ToV8());
}
void RenderFrameImpl::AddMessageToConsole(ConsoleMessageLevel level,
« no previous file with comments | « content/renderer/mojo/service_registry_js_wrapper.cc ('k') | content/test/data/web_ui_mojo.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698