| Index: sky/framework/embedder.dart
|
| diff --git a/sky/framework/embedder.dart b/sky/framework/embedder.dart
|
| index 484e340855e747e2752ce9d54c89c0778963eddd..d2d53fd5c92a7d60f947d452d8ee434487fc420a 100644
|
| --- a/sky/framework/embedder.dart
|
| +++ b/sky/framework/embedder.dart
|
| @@ -8,27 +8,26 @@ import "mojo:bindings" as bindings;
|
| import "mojo:core" as core;
|
| import "package:mojo/public/interfaces/application/service_provider.mojom.dart";
|
| import "package:mojo/public/interfaces/application/shell.mojom.dart";
|
| +import "package:services/service_registry/service_registry.mojom.dart";
|
|
|
| final _EmbedderImpl embedder = new _EmbedderImpl();
|
|
|
| class _EmbedderImpl {
|
| ApplicationConnection _connection;
|
| + ServiceRegistry _serviceRegistry;
|
|
|
| final ShellProxy shell = new ShellProxy.fromHandle(
|
| new core.MojoHandle(internals.takeShellProxyHandle()));
|
|
|
| ApplicationConnection get connection {
|
| if (_connection == null) {
|
| - var stubHandle = new core.MojoHandle(
|
| - internals.takeServicesProvidedToEmbedder());
|
| - var proxyHandle = new core.MojoHandle(
|
| - internals.takeServicesProvidedByEmbedder());
|
| + var stubHandle =
|
| + new core.MojoHandle(internals.takeServicesProvidedToEmbedder());
|
| + var proxyHandle =
|
| + new core.MojoHandle(internals.takeServicesProvidedByEmbedder());
|
| _connection = new ApplicationConection(
|
| - stubHandle.isValid ? ServiceProviderStub.fromHandle(stubHandle)
|
| - : null;
|
| - proxyHandle.isValid ? ServiceProviderProxy.fromHandle(proxyHandle)
|
| - : null;
|
| - );
|
| + stubHandle.isValid ? new ServiceProviderStub.fromHandle(stubHandle) : null,
|
| + proxyHandle.isValid ? new ServiceProviderProxy.fromHandle(proxyHandle) : null);
|
| }
|
| return _connection;
|
| }
|
| @@ -48,5 +47,14 @@ class _EmbedderImpl {
|
| appSp.ptr.connectToService(proxy.name, pipe.endpoints[1]);
|
| appSp.close();
|
| }
|
| +
|
| + ServiceRegistryProxy get serviceRegistry {
|
| + if (_serviceRegistry == null) {
|
| + _serviceRegistry = new ServiceRegistryProxy.fromHandle(
|
| + new core.MojoHandle(internals.takeServiceRegistry()));
|
| + }
|
| + return _serviceRegistry;
|
| + }
|
| }
|
|
|
| +
|
|
|