Generate Mojom Types in Dart (Take 2)

mojo/dart/packages/mojo_services/lib/mojo/media/audio_server.mojom.dart

Index: mojo/dart/packages/mojo_services/lib/mojo/media/audio_server.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/media/audio_server.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/media/audio_server.mojom.dart
index 662ccab1d7a68b9f567d5afa1577c2fcf9233b87..a67950aa1e9400e92ee698942efa7cefc1d79c8b 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/media/audio_server.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/media/audio_server.mojom.dart
@@ -5,9 +5,12 @@
 library audio_server_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_services/mojo/media/audio_track.mojom.dart' as audio_track_mojom;
 
 
@@ -76,9 +79,52 @@ class _AudioServerCreateTrackParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _audio_server_AudioServer_CreateTrack_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_AudioServerCreateTrackParams'
+      ..fullIdentifier = 'mojo.media._AudioServerCreateTrackParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Track')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..isInterfaceRequest = true
+    ..identifier = '_audio_track_AudioTrack__'
+    ..typeKey = '_audio_track_AudioTrack__'
+  )),
+      ];
+}
+
 
 const int _AudioServer_createTrackName = 0;
 
+mojom_types.MojomInterface _audio_server_AudioServer__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'AudioServer'
+      ..fullIdentifier = 'mojo.media.AudioServer')
+    ..interfaceName = 'AudioServer'
+    ..methods = <int, mojom_types.MojomMethod>{
+_AudioServer_createTrackName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'CreateTrack')
+        ..ordinal = _AudioServer_createTrackName..parameters = _audio_server_AudioServer_CreateTrack_Params__(),
+    };
+}
+
+class _AudioServerServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _audio_server_AudioServer__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class AudioServer {
   static const String serviceName = "mojo::media::AudioServer";
   void createTrack(Object track);
@@ -100,6 +146,9 @@ class _AudioServerProxyImpl extends bindings.Proxy {
     return new _AudioServerProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _AudioServerServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
@@ -243,6 +292,38 @@ class AudioServerStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _AudioServerServiceDescription();
 }
 
 
+
+
+
+
+
+Map<String, mojom_types.UserDefinedType> _initDescriptions() {
+  var map = new HashMap<String, mojom_types.UserDefinedType>();
+map["_audio_server_AudioServer_CreateTrack_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _audio_server_AudioServer_CreateTrack_Params__();
+map["_audio_server_AudioServer__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _audio_server_AudioServer__();
+audio_track_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;
+}
+