Generate Mojom Types in Dart (Take 2)

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

Index: mojo/dart/packages/mojo_services/lib/mojo/camera.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/camera.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/camera.mojom.dart
index ede740b4b3b3cca63524f42688a0a3d1d871c658..37ce87915a1eaec8a82ae6450b90335f4236c1a0 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/camera.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/camera.mojom.dart
@@ -5,9 +5,12 @@
 library camera_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;
 
 
 
@@ -83,6 +86,25 @@ class Photo extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _camera_Photo__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'Photo'
+      ..fullIdentifier = 'mojo.Photo')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'UniqueId')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Content')
+        ..type = (new mojom_types.Type()
+..handleType = (new mojom_types.HandleType()
+..kind = mojom_types.HandleTypeKind.dataPipeConsumer
+..nullable = false)),
+      ];
+}
 
 
 class _CameraRollServiceUpdateParams extends bindings.Struct {
@@ -141,6 +163,13 @@ class _CameraRollServiceUpdateParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _camera_CameraRollService_Update_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_CameraRollServiceUpdateParams'
+      ..fullIdentifier = 'mojo._CameraRollServiceUpdateParams')
+    ..fields = <mojom_types.StructField>[];
+}
 
 
 class _CameraRollServiceGetCountParams extends bindings.Struct {
@@ -199,6 +228,13 @@ class _CameraRollServiceGetCountParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _camera_CameraRollService_GetCount_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_CameraRollServiceGetCountParams'
+      ..fullIdentifier = 'mojo._CameraRollServiceGetCountParams')
+    ..fields = <mojom_types.StructField>[];
+}
 
 
 class CameraRollServiceGetCountResponseParams extends bindings.Struct {
@@ -266,6 +302,17 @@ class CameraRollServiceGetCountResponseParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _camera_CameraRollService_GetCount_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'CameraRollServiceGetCountResponseParams'
+      ..fullIdentifier = 'mojo.CameraRollServiceGetCountResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'NumPhotos')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint32),
+      ];
+}
 
 
 class _CameraRollServiceGetPhotoParams extends bindings.Struct {
@@ -333,6 +380,17 @@ class _CameraRollServiceGetPhotoParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _camera_CameraRollService_GetPhoto_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_CameraRollServiceGetPhotoParams'
+      ..fullIdentifier = 'mojo._CameraRollServiceGetPhotoParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Index')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint32),
+      ];
+}
 
 
 class CameraRollServiceGetPhotoResponseParams extends bindings.Struct {
@@ -400,6 +458,24 @@ class CameraRollServiceGetPhotoResponseParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _camera_CameraRollService_GetPhoto_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'CameraRollServiceGetPhotoResponseParams'
+      ..fullIdentifier = 'mojo.CameraRollServiceGetPhotoResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Photo')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+    ..nullable = true
+  
+  
+    ..identifier = '_camera_Photo__'
+    ..typeKey = '_camera_Photo__'
+  )),
+      ];
+}
 
 
 class _CameraServiceGetLatestFrameParams extends bindings.Struct {
@@ -458,6 +534,13 @@ class _CameraServiceGetLatestFrameParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _camera_CameraService_GetLatestFrame_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_CameraServiceGetLatestFrameParams'
+      ..fullIdentifier = 'mojo._CameraServiceGetLatestFrameParams')
+    ..fields = <mojom_types.StructField>[];
+}
 
 
 class CameraServiceGetLatestFrameResponseParams extends bindings.Struct {
@@ -524,11 +607,57 @@ class CameraServiceGetLatestFrameResponseParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _camera_CameraService_GetLatestFrame_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'CameraServiceGetLatestFrameResponseParams'
+      ..fullIdentifier = 'mojo.CameraServiceGetLatestFrameResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Content')
+        ..type = (new mojom_types.Type()
+..handleType = (new mojom_types.HandleType()
+..kind = mojom_types.HandleTypeKind.dataPipeConsumer
+..nullable = true)),
+      ];
+}
+
 
 const int _CameraRollService_updateName = 0;
 const int _CameraRollService_getCountName = 1;
 const int _CameraRollService_getPhotoName = 2;
 
+mojom_types.MojomInterface _camera_CameraRollService__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'CameraRollService'
+      ..fullIdentifier = 'mojo.CameraRollService')
+    ..interfaceName = 'CameraRollService'
+    ..methods = <int, mojom_types.MojomMethod>{
+_CameraRollService_updateName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Update')
+        ..ordinal = _CameraRollService_updateName..parameters = _camera_CameraRollService_Update_Params__(),_CameraRollService_getCountName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'GetCount')
+        ..ordinal = _CameraRollService_getCountName
+        ..responseParams = _camera_CameraRollService_GetCount_ResponseParams__()..parameters = _camera_CameraRollService_GetCount_Params__(),_CameraRollService_getPhotoName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'GetPhoto')
+        ..ordinal = _CameraRollService_getPhotoName
+        ..responseParams = _camera_CameraRollService_GetPhoto_ResponseParams__()..parameters = _camera_CameraRollService_GetPhoto_Params__(),
+    };
+}
+
+class _CameraRollServiceServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _camera_CameraRollService__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class CameraRollService {
   static const String serviceName = "mojo::CameraRollService";
   void update();
@@ -552,6 +681,9 @@ class _CameraRollServiceProxyImpl extends bindings.Proxy {
     return new _CameraRollServiceProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _CameraRollServiceServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _CameraRollService_getCountName:
@@ -805,10 +937,40 @@ class CameraRollServiceStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _CameraRollServiceServiceDescription();
 }
 
 const int _CameraService_getLatestFrameName = 0;
 
+mojom_types.MojomInterface _camera_CameraService__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'CameraService'
+      ..fullIdentifier = 'mojo.CameraService')
+    ..interfaceName = 'CameraService'
+    ..methods = <int, mojom_types.MojomMethod>{
+_CameraService_getLatestFrameName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'GetLatestFrame')
+        ..ordinal = _CameraService_getLatestFrameName
+        ..responseParams = _camera_CameraService_GetLatestFrame_ResponseParams__()..parameters = _camera_CameraService_GetLatestFrame_Params__(),
+    };
+}
+
+class _CameraServiceServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _camera_CameraService__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class CameraService {
   static const String serviceName = "mojo::CameraService";
   dynamic getLatestFrame([Function responseFactory = null]);
@@ -830,6 +992,9 @@ class _CameraServiceProxyImpl extends bindings.Proxy {
     return new _CameraServiceProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _CameraServiceServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _CameraService_getLatestFrameName:
@@ -1014,6 +1179,59 @@ class CameraServiceStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _CameraServiceServiceDescription();
 }
 
 
+
+
+
+
+
+Map<String, mojom_types.UserDefinedType> _initDescriptions() {
+  var map = new HashMap<String, mojom_types.UserDefinedType>();
+map["_camera_Photo__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _camera_Photo__();
+map["_camera_CameraRollService_Update_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _camera_CameraRollService_Update_Params__();
+map["_camera_CameraRollService_GetCount_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _camera_CameraRollService_GetCount_Params__();
+map["_camera_CameraRollService_GetCount_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _camera_CameraRollService_GetCount_ResponseParams__();
+map["_camera_CameraRollService_GetPhoto_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _camera_CameraRollService_GetPhoto_Params__();
+map["_camera_CameraRollService_GetPhoto_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _camera_CameraRollService_GetPhoto_ResponseParams__();
+map["_camera_CameraService_GetLatestFrame_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _camera_CameraService_GetLatestFrame_Params__();
+map["_camera_CameraService_GetLatestFrame_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _camera_CameraService_GetLatestFrame_ResponseParams__();
+map["_camera_CameraRollService__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _camera_CameraRollService__();
+map["_camera_CameraService__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _camera_CameraService__();
+
+  return map;
+}
+
+var _MojomDesc;
+Map<String, mojom_types.UserDefinedType> getAllMojomTypeDefinitions() {
+  if (_MojomDesc == null) {
+    _MojomDesc = _initDescriptions();
+  }
+  return _MojomDesc;
+}
+