Generate Mojom Types in Dart (Take 2)

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

Index: mojo/dart/packages/mojo_services/lib/mojo/navigation.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/navigation.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/navigation.mojom.dart
index dd656106f50fda7b574ce5c68fb3d08c8a40bd12..33dd0664efe29da8c658b5d244b5e4e84388fae7 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/navigation.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/navigation.mojom.dart
@@ -5,11 +5,13 @@
 library navigation_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/url_request.mojom.dart' as url_request_mojom;
-
 class Target extends bindings.MojoEnum {
   static const Target default_ = const Target._(0);
   static const Target sourceNode = const Target._(1);
@@ -61,12 +63,31 @@ class Target extends bindings.MojoEnum {
         return 'Target.sourceNode';
       case newNode:
         return 'Target.newNode';
+      default:
+        return null;
     }
   }
 
   int toJson() => mojoEnumValue;
 }
 
+mojom_types.MojomEnum _navigation_Target__() {
+  return new mojom_types.MojomEnum()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'Target'
+      ..fullIdentifier = 'mojo.Target')
+    ..values = <mojom_types.EnumValue>[new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Default')
+        ..enumTypeKey = '_navigation_Target__'
+        ..intValue = 0,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'SourceNode')
+        ..enumTypeKey = '_navigation_Target__'
+        ..intValue = 1,new mojom_types.EnumValue()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'NewNode')
+        ..enumTypeKey = '_navigation_Target__'
+        ..intValue = 2,];
+}
+
 
 
 class _NavigatorHostRequestNavigateParams extends bindings.Struct {
@@ -146,6 +167,31 @@ class _NavigatorHostRequestNavigateParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _navigation_NavigatorHost_RequestNavigate_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_NavigatorHostRequestNavigateParams'
+      ..fullIdentifier = 'mojo._NavigatorHostRequestNavigateParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Target')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_navigation_Target__'
+    ..typeKey = '_navigation_Target__'
+  )),
+      
+      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 _NavigatorHostRequestNavigateHistoryParams extends bindings.Struct {
@@ -213,6 +259,17 @@ class _NavigatorHostRequestNavigateHistoryParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _navigation_NavigatorHost_RequestNavigateHistory_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_NavigatorHostRequestNavigateHistoryParams'
+      ..fullIdentifier = 'mojo._NavigatorHostRequestNavigateHistoryParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Delta')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.int32),
+      ];
+}
 
 
 class _NavigatorHostDidNavigateLocallyParams extends bindings.Struct {
@@ -280,11 +337,53 @@ class _NavigatorHostDidNavigateLocallyParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _navigation_NavigatorHost_DidNavigateLocally_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_NavigatorHostDidNavigateLocallyParams'
+      ..fullIdentifier = 'mojo._NavigatorHostDidNavigateLocallyParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Url')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)),
+      ];
+}
+
 
 const int _NavigatorHost_requestNavigateName = 0;
 const int _NavigatorHost_requestNavigateHistoryName = 1;
 const int _NavigatorHost_didNavigateLocallyName = 2;
 
+mojom_types.MojomInterface _navigation_NavigatorHost__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'NavigatorHost'
+      ..fullIdentifier = 'mojo.NavigatorHost')
+    ..interfaceName = 'NavigatorHost'
+    ..methods = <int, mojom_types.MojomMethod>{
+_NavigatorHost_requestNavigateName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'RequestNavigate')
+        ..ordinal = _NavigatorHost_requestNavigateName..parameters = _navigation_NavigatorHost_RequestNavigate_Params__(),_NavigatorHost_requestNavigateHistoryName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'RequestNavigateHistory')
+        ..ordinal = _NavigatorHost_requestNavigateHistoryName..parameters = _navigation_NavigatorHost_RequestNavigateHistory_Params__(),_NavigatorHost_didNavigateLocallyName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'DidNavigateLocally')
+        ..ordinal = _NavigatorHost_didNavigateLocallyName..parameters = _navigation_NavigatorHost_DidNavigateLocally_Params__(),
+    };
+}
+
+class _NavigatorHostServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _navigation_NavigatorHost__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class NavigatorHost {
   static const String serviceName = "mojo::NavigatorHost";
   void requestNavigate(Target target, url_request_mojom.UrlRequest request);
@@ -308,6 +407,9 @@ class _NavigatorHostProxyImpl extends bindings.Proxy {
     return new _NavigatorHostProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _NavigatorHostServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
@@ -480,6 +582,47 @@ class NavigatorHostStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _NavigatorHostServiceDescription();
 }
 
 
+
+
+
+
+
+Map<String, mojom_types.UserDefinedType> _initDescriptions() {
+  var map = new HashMap<String, mojom_types.UserDefinedType>();
+map["_navigation_Target__"] =
+    new mojom_types.UserDefinedType()
+      ..enumType = _navigation_Target__();
+map["_navigation_NavigatorHost_RequestNavigate_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _navigation_NavigatorHost_RequestNavigate_Params__();
+map["_navigation_NavigatorHost_RequestNavigateHistory_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _navigation_NavigatorHost_RequestNavigateHistory_Params__();
+map["_navigation_NavigatorHost_DidNavigateLocally_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _navigation_NavigatorHost_DidNavigateLocally_Params__();
+map["_navigation_NavigatorHost__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _navigation_NavigatorHost__();
+url_request_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;
+}
+