| Index: mojo/dart/packages/mojo_services/lib/mojo/host_resolver.mojom.dart
|
| diff --git a/mojo/dart/packages/mojo_services/lib/mojo/host_resolver.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/host_resolver.mojom.dart
|
| index ca68ec832ac54a856f52d7809c3958fb9b0bbb9b..246c3b5a64d9e8c8b8887d7a48c275b53c9cf50b 100644
|
| --- a/mojo/dart/packages/mojo_services/lib/mojo/host_resolver.mojom.dart
|
| +++ b/mojo/dart/packages/mojo_services/lib/mojo/host_resolver.mojom.dart
|
| @@ -221,12 +221,50 @@ class _HostResolverServiceDescription implements service_describer.ServiceDescri
|
|
|
| abstract class HostResolver {
|
| static const String serviceName = null;
|
| +
|
| + static service_describer.ServiceDescription _cachedServiceDescription;
|
| + static service_describer.ServiceDescription get serviceDescription {
|
| + if (_cachedServiceDescription == null) {
|
| + _cachedServiceDescription = new _HostResolverServiceDescription();
|
| + }
|
| + return _cachedServiceDescription;
|
| + }
|
| +
|
| + static HostResolverProxy connectToService(
|
| + bindings.ServiceConnector s, String url, [String serviceName]) {
|
| + HostResolverProxy p = new HostResolverProxy.unbound();
|
| + String name = serviceName ?? HostResolver.serviceName;
|
| + if ((name == null) || name.isEmpty) {
|
| + throw new core.MojoApiError(
|
| + "If an interface has no ServiceName, then one must be provided.");
|
| + }
|
| + s.connectToService(url, p, name);
|
| + return p;
|
| + }
|
| dynamic getHostAddresses(String host,net_address_mojom.NetAddressFamily family,[Function responseFactory = null]);
|
| }
|
|
|
| +abstract class HostResolverInterface
|
| + implements bindings.MojoInterface<HostResolver>,
|
| + HostResolver {
|
| + factory HostResolverInterface([HostResolver impl]) =>
|
| + new HostResolverStub.unbound(impl);
|
| + factory HostResolverInterface.fromEndpoint(
|
| + core.MojoMessagePipeEndpoint endpoint,
|
| + [HostResolver impl]) =>
|
| + new HostResolverStub.fromEndpoint(endpoint, impl);
|
| +}
|
| +
|
| +abstract class HostResolverInterfaceRequest
|
| + implements bindings.MojoInterface<HostResolver>,
|
| + HostResolver {
|
| + factory HostResolverInterfaceRequest() =>
|
| + new HostResolverProxy.unbound();
|
| +}
|
| +
|
| class _HostResolverProxyControl
|
| extends bindings.ProxyMessageHandler
|
| - implements bindings.ProxyControl {
|
| + implements bindings.ProxyControl<HostResolver> {
|
| _HostResolverProxyControl.fromEndpoint(
|
| core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
|
|
|
| @@ -235,9 +273,6 @@ class _HostResolverProxyControl
|
|
|
| _HostResolverProxyControl.unbound() : super.unbound();
|
|
|
| - service_describer.ServiceDescription get serviceDescription =>
|
| - new _HostResolverServiceDescription();
|
| -
|
| String get serviceName => HostResolver.serviceName;
|
|
|
| void handleResponse(bindings.ServiceMessage message) {
|
| @@ -269,6 +304,11 @@ class _HostResolverProxyControl
|
| }
|
| }
|
|
|
| + HostResolver get impl => null;
|
| + set impl(HostResolver _) {
|
| + throw new core.MojoApiError("The impl of a Proxy cannot be set.");
|
| + }
|
| +
|
| @override
|
| String toString() {
|
| var superString = super.toString();
|
| @@ -277,8 +317,10 @@ class _HostResolverProxyControl
|
| }
|
|
|
| class HostResolverProxy
|
| - extends bindings.Proxy
|
| - implements HostResolver {
|
| + extends bindings.Proxy<HostResolver>
|
| + implements HostResolver,
|
| + HostResolverInterface,
|
| + HostResolverInterfaceRequest {
|
| HostResolverProxy.fromEndpoint(
|
| core.MojoMessagePipeEndpoint endpoint)
|
| : super(new _HostResolverProxyControl.fromEndpoint(endpoint));
|
| @@ -295,13 +337,6 @@ class HostResolverProxy
|
| return new HostResolverProxy.fromEndpoint(endpoint);
|
| }
|
|
|
| - factory HostResolverProxy.connectToService(
|
| - bindings.ServiceConnector s, String url, [String serviceName]) {
|
| - HostResolverProxy p = new HostResolverProxy.unbound();
|
| - s.connectToService(url, p, serviceName);
|
| - return p;
|
| - }
|
| -
|
|
|
| dynamic getHostAddresses(String host,net_address_mojom.NetAddressFamily family,[Function responseFactory = null]) {
|
| var params = new _HostResolverGetHostAddressesParams();
|
| @@ -334,6 +369,8 @@ class _HostResolverStubControl
|
|
|
| _HostResolverStubControl.unbound([this._impl]) : super.unbound();
|
|
|
| + String get serviceName => HostResolver.serviceName;
|
| +
|
|
|
| HostResolverGetHostAddressesResponseParams _hostResolverGetHostAddressesResponseParamsFactory(network_error_mojom.NetworkError result, List<net_address_mojom.NetAddress> addresses) {
|
| var result = new HostResolverGetHostAddressesResponseParams();
|
| @@ -407,19 +444,16 @@ class _HostResolverStubControl
|
| }
|
|
|
| int get version => 0;
|
| -
|
| - static service_describer.ServiceDescription _cachedServiceDescription;
|
| - static service_describer.ServiceDescription get serviceDescription {
|
| - if (_cachedServiceDescription == null) {
|
| - _cachedServiceDescription = new _HostResolverServiceDescription();
|
| - }
|
| - return _cachedServiceDescription;
|
| - }
|
| }
|
|
|
| class HostResolverStub
|
| extends bindings.Stub<HostResolver>
|
| - implements HostResolver {
|
| + implements HostResolver,
|
| + HostResolverInterface,
|
| + HostResolverInterfaceRequest {
|
| + HostResolverStub.unbound([HostResolver impl])
|
| + : super(new _HostResolverStubControl.unbound(impl));
|
| +
|
| HostResolverStub.fromEndpoint(
|
| core.MojoMessagePipeEndpoint endpoint, [HostResolver impl])
|
| : super(new _HostResolverStubControl.fromEndpoint(endpoint, impl));
|
| @@ -428,18 +462,12 @@ class HostResolverStub
|
| core.MojoHandle handle, [HostResolver impl])
|
| : super(new _HostResolverStubControl.fromHandle(handle, impl));
|
|
|
| - HostResolverStub.unbound([HostResolver impl])
|
| - : super(new _HostResolverStubControl.unbound(impl));
|
| -
|
| static HostResolverStub newFromEndpoint(
|
| core.MojoMessagePipeEndpoint endpoint) {
|
| assert(endpoint.setDescription("For HostResolverStub"));
|
| return new HostResolverStub.fromEndpoint(endpoint);
|
| }
|
|
|
| - static service_describer.ServiceDescription get serviceDescription =>
|
| - _HostResolverStubControl.serviceDescription;
|
| -
|
|
|
| dynamic getHostAddresses(String host,net_address_mojom.NetAddressFamily family,[Function responseFactory = null]) {
|
| return impl.getHostAddresses(host,family,responseFactory);
|
|
|