Generate Mojom Types in Dart (Take 2)

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

Index: mojo/dart/packages/mojo_services/lib/mojo/url_loader.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/url_loader.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/url_loader.mojom.dart
index 88714de0720e133237c67c54a9d86cb77ebe7c75..4d04e0e34df62fc499ad1d4a81ab67861a4c6234 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/url_loader.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/url_loader.mojom.dart
@@ -5,9 +5,12 @@
 library url_loader_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/network_error.mojom.dart' as network_error_mojom;
 import 'package:mojo/mojo/url_request.mojom.dart' as url_request_mojom;
 import 'package:mojo/mojo/url_response.mojom.dart' as url_response_mojom;
@@ -89,6 +92,28 @@ class UrlLoaderStatus extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _url_loader_URLLoaderStatus__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'UrlLoaderStatus'
+      ..fullIdentifier = 'mojo.UrlLoaderStatus')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Error')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+    ..nullable = true
+  
+  
+    ..identifier = '_network_error_NetworkError__'
+    ..typeKey = '_network_error_NetworkError__'
+  )),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'IsLoading')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.bool),
+      ];
+}
 
 
 class _UrlLoaderStartParams extends bindings.Struct {
@@ -156,6 +181,22 @@ class _UrlLoaderStartParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _url_loader_URLLoader_Start_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_UrlLoaderStartParams'
+      ..fullIdentifier = 'mojo._UrlLoaderStartParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Request')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_url_request_URLRequest__'
+    ..typeKey = '_url_request_URLRequest__'
+  )),
+      ];
+}
 
 
 class UrlLoaderStartResponseParams extends bindings.Struct {
@@ -223,6 +264,22 @@ class UrlLoaderStartResponseParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _url_loader_URLLoader_Start_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'UrlLoaderStartResponseParams'
+      ..fullIdentifier = 'mojo.UrlLoaderStartResponseParams')
+    ..fields = <mojom_types.StructField>[
+      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__'
+  )),
+      ];
+}
 
 
 class _UrlLoaderFollowRedirectParams extends bindings.Struct {
@@ -281,6 +338,13 @@ class _UrlLoaderFollowRedirectParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _url_loader_URLLoader_FollowRedirect_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_UrlLoaderFollowRedirectParams'
+      ..fullIdentifier = 'mojo._UrlLoaderFollowRedirectParams')
+    ..fields = <mojom_types.StructField>[];
+}
 
 
 class UrlLoaderFollowRedirectResponseParams extends bindings.Struct {
@@ -348,6 +412,22 @@ class UrlLoaderFollowRedirectResponseParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _url_loader_URLLoader_FollowRedirect_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'UrlLoaderFollowRedirectResponseParams'
+      ..fullIdentifier = 'mojo.UrlLoaderFollowRedirectResponseParams')
+    ..fields = <mojom_types.StructField>[
+      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__'
+  )),
+      ];
+}
 
 
 class _UrlLoaderQueryStatusParams extends bindings.Struct {
@@ -406,6 +486,13 @@ class _UrlLoaderQueryStatusParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _url_loader_URLLoader_QueryStatus_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_UrlLoaderQueryStatusParams'
+      ..fullIdentifier = 'mojo._UrlLoaderQueryStatusParams')
+    ..fields = <mojom_types.StructField>[];
+}
 
 
 class UrlLoaderQueryStatusResponseParams extends bindings.Struct {
@@ -474,11 +561,60 @@ class UrlLoaderQueryStatusResponseParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _url_loader_URLLoader_QueryStatus_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'UrlLoaderQueryStatusResponseParams'
+      ..fullIdentifier = 'mojo.UrlLoaderQueryStatusResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Status')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_url_loader_URLLoaderStatus__'
+    ..typeKey = '_url_loader_URLLoaderStatus__'
+  )),
+      ];
+}
+
 
 const int _UrlLoader_startName = 0;
 const int _UrlLoader_followRedirectName = 1;
 const int _UrlLoader_queryStatusName = 2;
 
+mojom_types.MojomInterface _url_loader_URLLoader__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'UrlLoader'
+      ..fullIdentifier = 'mojo.UrlLoader')
+    ..interfaceName = 'UrlLoader'
+    ..methods = <int, mojom_types.MojomMethod>{
+_UrlLoader_startName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Start')
+        ..ordinal = _UrlLoader_startName
+        ..responseParams = _url_loader_URLLoader_Start_ResponseParams__()..parameters = _url_loader_URLLoader_Start_Params__(),_UrlLoader_followRedirectName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'FollowRedirect')
+        ..ordinal = _UrlLoader_followRedirectName
+        ..responseParams = _url_loader_URLLoader_FollowRedirect_ResponseParams__()..parameters = _url_loader_URLLoader_FollowRedirect_Params__(),_UrlLoader_queryStatusName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'QueryStatus')
+        ..ordinal = _UrlLoader_queryStatusName
+        ..responseParams = _url_loader_URLLoader_QueryStatus_ResponseParams__()..parameters = _url_loader_URLLoader_QueryStatus_Params__(),
+    };
+}
+
+class _UrlLoaderServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _url_loader_URLLoader__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class UrlLoader {
   static const String serviceName = null;
   dynamic start(url_request_mojom.UrlRequest request,[Function responseFactory = null]);
@@ -502,6 +638,9 @@ class _UrlLoaderProxyImpl extends bindings.Proxy {
     return new _UrlLoaderProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _UrlLoaderServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _UrlLoader_startName:
@@ -797,6 +936,62 @@ class UrlLoaderStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _UrlLoaderServiceDescription();
+}
+
+
+
+
+
+
+
+Map<String, mojom_types.UserDefinedType> _initDescriptions() {
+  var map = new HashMap<String, mojom_types.UserDefinedType>();
+map["_url_loader_URLLoaderStatus__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _url_loader_URLLoaderStatus__();
+map["_url_loader_URLLoader_Start_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _url_loader_URLLoader_Start_Params__();
+map["_url_loader_URLLoader_Start_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _url_loader_URLLoader_Start_ResponseParams__();
+map["_url_loader_URLLoader_FollowRedirect_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _url_loader_URLLoader_FollowRedirect_Params__();
+map["_url_loader_URLLoader_FollowRedirect_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _url_loader_URLLoader_FollowRedirect_ResponseParams__();
+map["_url_loader_URLLoader_QueryStatus_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _url_loader_URLLoader_QueryStatus_Params__();
+map["_url_loader_URLLoader_QueryStatus_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _url_loader_URLLoader_QueryStatus_ResponseParams__();
+map["_url_loader_URLLoader__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _url_loader_URLLoader__();
+network_error_mojom.getAllMojomTypeDefinitions().forEach((String s, mojom_types.UserDefinedType udt) {
+  map[s] = udt;
+});
+url_request_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;
+}