Generate Mojom Types in Dart (Take 2)

mojo/dart/packages/mojo/lib/mojo/application_connector.mojom.dart

Index: mojo/dart/packages/mojo/lib/mojo/application_connector.mojom.dart
diff --git a/mojo/dart/packages/mojo/lib/mojo/application_connector.mojom.dart b/mojo/dart/packages/mojo/lib/mojo/application_connector.mojom.dart
index 9806c012ef75a051752fdb7dd2e6773210e51588..ec60aeec2b2f40010fb30f7b394894539e2396a4 100644
--- a/mojo/dart/packages/mojo/lib/mojo/application_connector.mojom.dart
+++ b/mojo/dart/packages/mojo/lib/mojo/application_connector.mojom.dart
@@ -5,9 +5,12 @@
 library application_connector_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;
 import 'package:mojo/mojo/service_provider.mojom.dart' as service_provider_mojom;
 
 
@@ -92,6 +95,41 @@ class _ApplicationConnectorConnectToApplicationParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _application_connector_ApplicationConnector_ConnectToApplication_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_ApplicationConnectorConnectToApplicationParams'
+      ..fullIdentifier = 'mojo._ApplicationConnectorConnectToApplicationParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'ApplicationUrl')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Services')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+    ..nullable = true
+  
+  
+    ..isInterfaceRequest = true
+    ..identifier = '_service_provider_ServiceProvider__'
+    ..typeKey = '_service_provider_ServiceProvider__'
+  )),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'ExposedServices')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+    ..nullable = true
+  
+  
+    ..identifier = '_service_provider_ServiceProvider__'
+    ..typeKey = '_service_provider_ServiceProvider__'
+  )),
+      ];
+}
 
 
 class _ApplicationConnectorDuplicateParams extends bindings.Struct {
@@ -158,10 +196,55 @@ class _ApplicationConnectorDuplicateParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _application_connector_ApplicationConnector_Duplicate_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_ApplicationConnectorDuplicateParams'
+      ..fullIdentifier = 'mojo._ApplicationConnectorDuplicateParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'ApplicationConnectorRequest')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..isInterfaceRequest = true
+    ..identifier = '_application_connector_ApplicationConnector__'
+    ..typeKey = '_application_connector_ApplicationConnector__'
+  )),
+      ];
+}
+
 
 const int _ApplicationConnector_connectToApplicationName = 0;
 const int _ApplicationConnector_duplicateName = 1;
 
+mojom_types.MojomInterface _application_connector_ApplicationConnector__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'ApplicationConnector'
+      ..fullIdentifier = 'mojo.ApplicationConnector')
+    ..interfaceName = 'ApplicationConnector'
+    ..methods = <int, mojom_types.MojomMethod>{
+_ApplicationConnector_connectToApplicationName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'ConnectToApplication')
+        ..ordinal = _ApplicationConnector_connectToApplicationName..parameters = _application_connector_ApplicationConnector_ConnectToApplication_Params__(),_ApplicationConnector_duplicateName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Duplicate')
+        ..ordinal = _ApplicationConnector_duplicateName..parameters = _application_connector_ApplicationConnector_Duplicate_Params__(),
+    };
+}
+
+class _ApplicationConnectorServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _application_connector_ApplicationConnector__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class ApplicationConnector {
   static const String serviceName = null;
   void connectToApplication(String applicationUrl, Object services, Object exposedServices);
@@ -184,6 +267,9 @@ class _ApplicationConnectorProxyImpl extends bindings.Proxy {
     return new _ApplicationConnectorProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _ApplicationConnectorServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
@@ -343,6 +429,41 @@ class ApplicationConnectorStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _ApplicationConnectorServiceDescription();
 }
 
 
+
+
+
+
+
+Map<String, mojom_types.UserDefinedType> _initDescriptions() {
+  var map = new HashMap<String, mojom_types.UserDefinedType>();
+map["_application_connector_ApplicationConnector_ConnectToApplication_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _application_connector_ApplicationConnector_ConnectToApplication_Params__();
+map["_application_connector_ApplicationConnector_Duplicate_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _application_connector_ApplicationConnector_Duplicate_Params__();
+map["_application_connector_ApplicationConnector__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _application_connector_ApplicationConnector__();
+service_provider_mojom.getAllMojomTypeDefinitions().forEach((String s, mojom_types.UserDefinedType udt) {
+  map[s] = udt;
+});
+
+  return map;
+}
+
+var _MojomDesc;
+Map<String, mojom_types.UserDefinedType> getAllMojomTypeDefinitions() {
+  if (_MojomDesc == null) {
+    _MojomDesc = _initDescriptions();
+  }
+  return _MojomDesc;
+}
+