Generate Mojom Types in Dart (Take 2)

mojo/dart/packages/mojo/lib/mojo/service_provider.mojom.dart

Index: mojo/dart/packages/mojo/lib/mojo/service_provider.mojom.dart
diff --git a/mojo/dart/packages/mojo/lib/mojo/service_provider.mojom.dart b/mojo/dart/packages/mojo/lib/mojo/service_provider.mojom.dart
index c39eba11d9c5257feb7cb95768647c625a2da1ca..0d9ea7da6c7d23f689e453a277ddf3fc9afefe13 100644
--- a/mojo/dart/packages/mojo/lib/mojo/service_provider.mojom.dart
+++ b/mojo/dart/packages/mojo/lib/mojo/service_provider.mojom.dart
@@ -5,9 +5,12 @@
 library service_provider_mojom;
 
 import 'dart:async';
+import 'dart:collection';
 
 import 'package:mojo/bindings.dart' as bindings;
 import 'package:mojo/core.dart' as core;
+import 'package:mojo/mojo/bindings/types/mojom_types.mojom.dart' as mojom_types;
+import 'package:mojo/mojo/bindings/types/service_describer.mojom.dart' as service_describer;
 
 
 
@@ -83,9 +86,54 @@ class _ServiceProviderConnectToServiceParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _service_provider_ServiceProvider_ConnectToService_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_ServiceProviderConnectToServiceParams'
+      ..fullIdentifier = 'mojo._ServiceProviderConnectToServiceParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'InterfaceName')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Pipe')
+        ..type = (new mojom_types.Type()
+..handleType = (new mojom_types.HandleType()
+..kind = mojom_types.HandleTypeKind.messagePipe
+..nullable = false)),
+      ];
+}
+
 
 const int _ServiceProvider_connectToServiceName = 0;
 
+mojom_types.MojomInterface _service_provider_ServiceProvider__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'ServiceProvider'
+      ..fullIdentifier = 'mojo.ServiceProvider')
+    ..interfaceName = 'ServiceProvider'
+    ..methods = <int, mojom_types.MojomMethod>{
+_ServiceProvider_connectToServiceName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'ConnectToService')
+        ..ordinal = _ServiceProvider_connectToServiceName..parameters = _service_provider_ServiceProvider_ConnectToService_Params__(),
+    };
+}
+
+class _ServiceProviderServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _service_provider_ServiceProvider__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class ServiceProvider {
   static const String serviceName = null;
   void connectToService(String interfaceName, core.MojoMessagePipeEndpoint pipe);
@@ -107,6 +155,9 @@ class _ServiceProviderProxyImpl extends bindings.Proxy {
     return new _ServiceProviderProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _ServiceProviderServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
@@ -251,6 +302,35 @@ class ServiceProviderStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _ServiceProviderServiceDescription();
+}
+
+
+
+
+
+
+
+Map<String, mojom_types.UserDefinedType> _initDescriptions() {
+  var map = new HashMap<String, mojom_types.UserDefinedType>();
+map["_service_provider_ServiceProvider_ConnectToService_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _service_provider_ServiceProvider_ConnectToService_Params__();
+map["_service_provider_ServiceProvider__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _service_provider_ServiceProvider__();
+
+  return map;
 }
 
+var _MojomDesc;
+Map<String, mojom_types.UserDefinedType> getAllMojomTypeDefinitions() {
+  if (_MojomDesc == null) {
+    _MojomDesc = _initDescriptions();
+  }
+  return _MojomDesc;
+}