| Index: content/renderer/renderer_blink_platform_impl.h
|
| diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
|
| index 2c05ea6608505a209483f954d3607f8c34c928b5..8b43867636ee383b1c988abfc27533b0f444afdc 100644
|
| --- a/content/renderer/renderer_blink_platform_impl.h
|
| +++ b/content/renderer/renderer_blink_platform_impl.h
|
| @@ -49,6 +49,7 @@ class WebThreadImplForRendererScheduler;
|
| }
|
|
|
| namespace content {
|
| +class BlinkServiceRegistryImpl;
|
| class DeviceLightEventPump;
|
| class DeviceMotionEventPump;
|
| class DeviceOrientationEventPump;
|
| @@ -57,6 +58,7 @@ class PlatformEventObserverBase;
|
| class QuotaMessageFilter;
|
| class RendererClipboardDelegate;
|
| class RenderView;
|
| +class ServiceRegistry;
|
| class ThreadSafeSender;
|
| class WebClipboardImpl;
|
| class WebDatabaseObserverImpl;
|
| @@ -64,8 +66,8 @@ class WebFileSystemImpl;
|
|
|
| class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
|
| public:
|
| - explicit RendererBlinkPlatformImpl(
|
| - scheduler::RendererScheduler* renderer_scheduler);
|
| + RendererBlinkPlatformImpl(scheduler::RendererScheduler* renderer_scheduler,
|
| + base::WeakPtr<ServiceRegistry> service_registry);
|
| ~RendererBlinkPlatformImpl() override;
|
|
|
| // Shutdown must be called just prior to shutting down blink.
|
| @@ -178,8 +180,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
|
| blink::WebString convertIDNToUnicode(
|
| const blink::WebString& host,
|
| const blink::WebString& languages) override;
|
| - void connectToRemoteService(const char* name,
|
| - mojo::ScopedMessagePipeHandle handle) override;
|
| + blink::ServiceRegistry* serviceRegistry() override;
|
| void startListening(blink::WebPlatformEventType,
|
| blink::WebPlatformEventListener*) override;
|
| void stopListening(blink::WebPlatformEventType) override;
|
| @@ -299,6 +300,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
|
|
|
| scoped_ptr<LocalStorageCachedAreas> local_storage_cached_areas_;
|
|
|
| + scoped_ptr<BlinkServiceRegistryImpl> blink_service_registry_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(RendererBlinkPlatformImpl);
|
| };
|
|
|
|
|