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

Unified Diff: content/renderer/renderer_blink_platform_impl.cc

Issue 1830883002: Add blink::ServiceRegistry and expose it from LocalFrame and Platform. (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
Index: content/renderer/renderer_blink_platform_impl.cc
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index 88df4251a5e960afc6c4cd5db7ba20a0e350496c..60714b70adb9ca9a8071b60f0174c78893ca47e8 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -68,6 +68,7 @@
#include "content/renderer/media/renderer_webaudiodevice_impl.h"
#include "content/renderer/media/renderer_webmidiaccessor_impl.h"
#include "content/renderer/media/rtc_certificate_generator.h"
+#include "content/renderer/mojo/blink_service_registry_impl.h"
#include "content/renderer/render_thread_impl.h"
#include "content/renderer/renderer_clipboard_delegate.h"
#include "content/renderer/screen_orientation/screen_orientation_observer.h"
@@ -237,7 +238,8 @@ class RendererBlinkPlatformImpl::SandboxSupport
//------------------------------------------------------------------------------
RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
- scheduler::RendererScheduler* renderer_scheduler)
+ scheduler::RendererScheduler* renderer_scheduler,
+ base::WeakPtr<ServiceRegistry> service_registry)
: BlinkPlatformImpl(renderer_scheduler->DefaultTaskRunner()),
main_thread_(renderer_scheduler->CreateMainThread()),
clipboard_delegate_(new RendererClipboardDelegate),
@@ -248,7 +250,8 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
default_task_runner_(renderer_scheduler->DefaultTaskRunner()),
loading_task_runner_(renderer_scheduler->LoadingTaskRunner()),
web_scrollbar_behavior_(new WebScrollbarBehaviorImpl),
- renderer_scheduler_(renderer_scheduler) {
+ renderer_scheduler_(renderer_scheduler),
+ blink_service_registry_(new BlinkServiceRegistryImpl(service_registry)) {
#if !defined(OS_ANDROID) && !defined(OS_WIN)
if (g_sandbox_enabled && sandboxEnabled()) {
sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport);
@@ -1205,11 +1208,8 @@ void RendererBlinkPlatformImpl::SetPlatformEventObserverForTesting(
platform_event_observers_.AddWithID(observer.release(), type);
}
-void RendererBlinkPlatformImpl::connectToRemoteService(
- const char* name,
- mojo::ScopedMessagePipeHandle handle) {
- RenderThread::Get()->GetServiceRegistry()->ConnectToRemoteService(
- name, std::move(handle));
+blink::ServiceRegistry* RendererBlinkPlatformImpl::serviceRegistry() {
+ return blink_service_registry_.get();
}
void RendererBlinkPlatformImpl::startListening(

Powered by Google App Engine
This is Rietveld 408576698