Generate Mojom Types in Dart (Take 2)

mojo/dart/packages/mojo_services/lib/mojo/content_handler.mojom.dart

Index: mojo/dart/packages/mojo_services/lib/mojo/content_handler.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/content_handler.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/content_handler.mojom.dart
index 7631019043bb2e50251815426fcc16e47753e09b..b4d2509e42857e94bc50dc4a3fd691dc5b587b41 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/content_handler.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/content_handler.mojom.dart
@@ -5,9 +5,12 @@
 library content_handler_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/application.mojom.dart' as application_mojom;
 import 'package:mojo/mojo/url_response.mojom.dart' as url_response_mojom;
 
@@ -86,9 +89,61 @@ class _ContentHandlerStartApplicationParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _content_handler_ContentHandler_StartApplication_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_ContentHandlerStartApplicationParams'
+      ..fullIdentifier = 'mojo._ContentHandlerStartApplicationParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Application')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..isInterfaceRequest = true
+    ..identifier = '_application_Application__'
+    ..typeKey = '_application_Application__'
+  )),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Response')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_url_response_URLResponse__'
+    ..typeKey = '_url_response_URLResponse__'
+  )),
+      ];
+}
+
 
 const int _ContentHandler_startApplicationName = 0;
 
+mojom_types.MojomInterface _content_handler_ContentHandler__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'ContentHandler'
+      ..fullIdentifier = 'mojo.ContentHandler')
+    ..interfaceName = 'ContentHandler'
+    ..methods = <int, mojom_types.MojomMethod>{
+_ContentHandler_startApplicationName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'StartApplication')
+        ..ordinal = _ContentHandler_startApplicationName..parameters = _content_handler_ContentHandler_StartApplication_Params__(),
+    };
+}
+
+class _ContentHandlerServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _content_handler_ContentHandler__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class ContentHandler {
   static const String serviceName = "mojo::ContentHandler";
   void startApplication(Object application, url_response_mojom.UrlResponse response);
@@ -110,6 +165,9 @@ class _ContentHandlerProxyImpl extends bindings.Proxy {
     return new _ContentHandlerProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _ContentHandlerServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
@@ -254,6 +312,41 @@ class ContentHandlerStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _ContentHandlerServiceDescription();
+}
+
+
+
+
+
+
+
+Map<String, mojom_types.UserDefinedType> _initDescriptions() {
+  var map = new HashMap<String, mojom_types.UserDefinedType>();
+map["_content_handler_ContentHandler_StartApplication_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _content_handler_ContentHandler_StartApplication_Params__();
+map["_content_handler_ContentHandler__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _content_handler_ContentHandler__();
+application_mojom.getAllMojomTypeDefinitions().forEach((String s, mojom_types.UserDefinedType udt) {
+  map[s] = udt;
+});
+url_response_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;
+}