Generate Mojom Types in Dart (Take 2)

mojo/dart/packages/mojo_services/lib/mojo/ui/views.mojom.dart

Index: mojo/dart/packages/mojo_services/lib/mojo/ui/views.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/ui/views.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/ui/views.mojom.dart
index 33c3d136ca8414417bf9e22dacc345438d890145..2c4b304682854f59271c434e2c67222b4b85f4cf 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/ui/views.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/ui/views.mojom.dart
@@ -5,9 +5,12 @@
 library views_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;
 import 'package:mojo_services/mojo/ui/layouts.mojom.dart' as layouts_mojom;
 
@@ -78,6 +81,17 @@ class ViewToken extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _views_ViewToken__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'ViewToken'
+      ..fullIdentifier = 'mojo.ui.ViewToken')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Value')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint32),
+      ];
+}
 
 
 class _ViewOnLayoutParams extends bindings.Struct {
@@ -155,6 +169,27 @@ class _ViewOnLayoutParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _views_View_OnLayout_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_ViewOnLayoutParams'
+      ..fullIdentifier = 'mojo.ui._ViewOnLayoutParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'LayoutParams')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_layouts_ViewLayoutParams__'
+    ..typeKey = '_layouts_ViewLayoutParams__'
+  )),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'ChildrenNeedingLayout')
+        ..type = (new mojom_types.Type()..arrayType = (new mojom_types.ArrayType()
+    ..elementType = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint32))),
+      ];
+}
 
 
 class ViewOnLayoutResponseParams extends bindings.Struct {
@@ -223,6 +258,22 @@ class ViewOnLayoutResponseParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _views_View_OnLayout_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'ViewOnLayoutResponseParams'
+      ..fullIdentifier = 'mojo.ui.ViewOnLayoutResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Info')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_layouts_ViewLayoutInfo__'
+    ..typeKey = '_layouts_ViewLayoutInfo__'
+  )),
+      ];
+}
 
 
 class _ViewOnChildUnavailableParams extends bindings.Struct {
@@ -290,6 +341,17 @@ class _ViewOnChildUnavailableParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _views_View_OnChildUnavailable_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_ViewOnChildUnavailableParams'
+      ..fullIdentifier = 'mojo.ui._ViewOnChildUnavailableParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'ChildKey')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint32),
+      ];
+}
 
 
 class ViewOnChildUnavailableResponseParams extends bindings.Struct {
@@ -348,6 +410,13 @@ class ViewOnChildUnavailableResponseParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _views_View_OnChildUnavailable_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'ViewOnChildUnavailableResponseParams'
+      ..fullIdentifier = 'mojo.ui.ViewOnChildUnavailableResponseParams')
+    ..fields = <mojom_types.StructField>[];
+}
 
 
 class _ViewHostGetServiceProviderParams extends bindings.Struct {
@@ -414,6 +483,23 @@ class _ViewHostGetServiceProviderParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _views_ViewHost_GetServiceProvider_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_ViewHostGetServiceProviderParams'
+      ..fullIdentifier = 'mojo.ui._ViewHostGetServiceProviderParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'ServiceProvider')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..isInterfaceRequest = true
+    ..identifier = '_service_provider_ServiceProvider__'
+    ..typeKey = '_service_provider_ServiceProvider__'
+  )),
+      ];
+}
 
 
 class _ViewHostRequestLayoutParams extends bindings.Struct {
@@ -472,6 +558,13 @@ class _ViewHostRequestLayoutParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _views_ViewHost_RequestLayout_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_ViewHostRequestLayoutParams'
+      ..fullIdentifier = 'mojo.ui._ViewHostRequestLayoutParams')
+    ..fields = <mojom_types.StructField>[];
+}
 
 
 class _ViewHostAddChildParams extends bindings.Struct {
@@ -549,6 +642,26 @@ class _ViewHostAddChildParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _views_ViewHost_AddChild_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_ViewHostAddChildParams'
+      ..fullIdentifier = 'mojo.ui._ViewHostAddChildParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'ChildKey')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint32),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'ChildViewToken')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_views_ViewToken__'
+    ..typeKey = '_views_ViewToken__'
+  )),
+      ];
+}
 
 
 class _ViewHostRemoveChildParams extends bindings.Struct {
@@ -616,6 +729,17 @@ class _ViewHostRemoveChildParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _views_ViewHost_RemoveChild_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_ViewHostRemoveChildParams'
+      ..fullIdentifier = 'mojo.ui._ViewHostRemoveChildParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'ChildKey')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint32),
+      ];
+}
 
 
 class _ViewHostLayoutChildParams extends bindings.Struct {
@@ -693,6 +817,26 @@ class _ViewHostLayoutChildParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _views_ViewHost_LayoutChild_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_ViewHostLayoutChildParams'
+      ..fullIdentifier = 'mojo.ui._ViewHostLayoutChildParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'ChildKey')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint32),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'ChildLayoutParams')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_layouts_ViewLayoutParams__'
+    ..typeKey = '_layouts_ViewLayoutParams__'
+  )),
+      ];
+}
 
 
 class ViewHostLayoutChildResponseParams extends bindings.Struct {
@@ -761,10 +905,58 @@ class ViewHostLayoutChildResponseParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _views_ViewHost_LayoutChild_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'ViewHostLayoutChildResponseParams'
+      ..fullIdentifier = 'mojo.ui.ViewHostLayoutChildResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Info')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+    ..nullable = true
+  
+  
+    ..identifier = '_layouts_ViewLayoutInfo__'
+    ..typeKey = '_layouts_ViewLayoutInfo__'
+  )),
+      ];
+}
+
 
 const int _View_onLayoutName = 0;
 const int _View_onChildUnavailableName = 1;
 
+mojom_types.MojomInterface _views_View__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'View'
+      ..fullIdentifier = 'mojo.ui.View')
+    ..interfaceName = 'View'
+    ..methods = <int, mojom_types.MojomMethod>{
+_View_onLayoutName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'OnLayout')
+        ..ordinal = _View_onLayoutName
+        ..responseParams = _views_View_OnLayout_ResponseParams__()..parameters = _views_View_OnLayout_Params__(),_View_onChildUnavailableName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'OnChildUnavailable')
+        ..ordinal = _View_onChildUnavailableName
+        ..responseParams = _views_View_OnChildUnavailable_ResponseParams__()..parameters = _views_View_OnChildUnavailable_Params__(),
+    };
+}
+
+class _ViewServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _views_View__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class View {
   static const String serviceName = null;
   dynamic onLayout(layouts_mojom.ViewLayoutParams layoutParams,List<int> childrenNeedingLayout,[Function responseFactory = null]);
@@ -787,6 +979,9 @@ class _ViewProxyImpl extends bindings.Proxy {
     return new _ViewProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _ViewServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _View_onLayoutName:
@@ -1028,6 +1223,10 @@ class ViewStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _ViewServiceDescription();
 }
 
 const int _ViewHost_getServiceProviderName = 0;
@@ -1036,6 +1235,40 @@ const int _ViewHost_addChildName = 2;
 const int _ViewHost_removeChildName = 3;
 const int _ViewHost_layoutChildName = 4;
 
+mojom_types.MojomInterface _views_ViewHost__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'ViewHost'
+      ..fullIdentifier = 'mojo.ui.ViewHost')
+    ..interfaceName = 'ViewHost'
+    ..methods = <int, mojom_types.MojomMethod>{
+_ViewHost_getServiceProviderName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'GetServiceProvider')
+        ..ordinal = _ViewHost_getServiceProviderName..parameters = _views_ViewHost_GetServiceProvider_Params__(),_ViewHost_requestLayoutName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'RequestLayout')
+        ..ordinal = _ViewHost_requestLayoutName..parameters = _views_ViewHost_RequestLayout_Params__(),_ViewHost_addChildName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'AddChild')
+        ..ordinal = _ViewHost_addChildName..parameters = _views_ViewHost_AddChild_Params__(),_ViewHost_removeChildName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'RemoveChild')
+        ..ordinal = _ViewHost_removeChildName..parameters = _views_ViewHost_RemoveChild_Params__(),_ViewHost_layoutChildName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'LayoutChild')
+        ..ordinal = _ViewHost_layoutChildName
+        ..responseParams = _views_ViewHost_LayoutChild_ResponseParams__()..parameters = _views_ViewHost_LayoutChild_Params__(),
+    };
+}
+
+class _ViewHostServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _views_ViewHost__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class ViewHost {
   static const String serviceName = null;
   void getServiceProvider(Object serviceProvider);
@@ -1061,6 +1294,9 @@ class _ViewHostProxyImpl extends bindings.Proxy {
     return new _ViewHostProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _ViewHostServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _ViewHost_layoutChildName:
@@ -1303,6 +1539,74 @@ class ViewHostStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _ViewHostServiceDescription();
 }
 
 
+
+
+
+
+
+Map<String, mojom_types.UserDefinedType> _initDescriptions() {
+  var map = new HashMap<String, mojom_types.UserDefinedType>();
+map["_views_ViewToken__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _views_ViewToken__();
+map["_views_View_OnLayout_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _views_View_OnLayout_Params__();
+map["_views_View_OnLayout_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _views_View_OnLayout_ResponseParams__();
+map["_views_View_OnChildUnavailable_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _views_View_OnChildUnavailable_Params__();
+map["_views_View_OnChildUnavailable_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _views_View_OnChildUnavailable_ResponseParams__();
+map["_views_ViewHost_GetServiceProvider_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _views_ViewHost_GetServiceProvider_Params__();
+map["_views_ViewHost_RequestLayout_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _views_ViewHost_RequestLayout_Params__();
+map["_views_ViewHost_AddChild_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _views_ViewHost_AddChild_Params__();
+map["_views_ViewHost_RemoveChild_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _views_ViewHost_RemoveChild_Params__();
+map["_views_ViewHost_LayoutChild_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _views_ViewHost_LayoutChild_Params__();
+map["_views_ViewHost_LayoutChild_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _views_ViewHost_LayoutChild_ResponseParams__();
+map["_views_View__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _views_View__();
+map["_views_ViewHost__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _views_ViewHost__();
+service_provider_mojom.getAllMojomTypeDefinitions().forEach((String s, mojom_types.UserDefinedType udt) {
+  map[s] = udt;
+});
+layouts_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;
+}
+