Generate Mojom Types in Dart (Take 2)

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

Index: mojo/dart/packages/mojo_services/lib/authentication/authentication.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/authentication/authentication.mojom.dart b/mojo/dart/packages/mojo_services/lib/authentication/authentication.mojom.dart
index 9a198f4c199a7b92abefbd7ff522c5bcff5b8f9b..2c1239e77bf5974ae6ee0cd410f3b2768deb1ceb 100644
--- a/mojo/dart/packages/mojo_services/lib/authentication/authentication.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/authentication/authentication.mojom.dart
@@ -5,9 +5,12 @@
 library authentication_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;
 
 
 
@@ -76,6 +79,17 @@ class _AuthenticationServiceSelectAccountParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _authentication_AuthenticationService_SelectAccount_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_AuthenticationServiceSelectAccountParams'
+      ..fullIdentifier = 'authentication._AuthenticationServiceSelectAccountParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'ReturnLastSelected')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.bool),
+      ];
+}
 
 
 class AuthenticationServiceSelectAccountResponseParams extends bindings.Struct {
@@ -152,6 +166,23 @@ class AuthenticationServiceSelectAccountResponseParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _authentication_AuthenticationService_SelectAccount_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'AuthenticationServiceSelectAccountResponseParams'
+      ..fullIdentifier = 'authentication.AuthenticationServiceSelectAccountResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Username')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = true)),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Error')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = true)),
+      ];
+}
 
 
 class _AuthenticationServiceGetOAuth2TokenParams extends bindings.Struct {
@@ -244,6 +275,24 @@ class _AuthenticationServiceGetOAuth2TokenParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _authentication_AuthenticationService_GetOAuth2Token_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_AuthenticationServiceGetOAuth2TokenParams'
+      ..fullIdentifier = 'authentication._AuthenticationServiceGetOAuth2TokenParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Username')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Scopes')
+        ..type = (new mojom_types.Type()..arrayType = (new mojom_types.ArrayType()
+    ..elementType = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)))),
+      ];
+}
 
 
 class AuthenticationServiceGetOAuth2TokenResponseParams extends bindings.Struct {
@@ -320,6 +369,23 @@ class AuthenticationServiceGetOAuth2TokenResponseParams extends bindings.Struct
     return map;
   }
 }
+mojom_types.MojomStruct _authentication_AuthenticationService_GetOAuth2Token_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'AuthenticationServiceGetOAuth2TokenResponseParams'
+      ..fullIdentifier = 'authentication.AuthenticationServiceGetOAuth2TokenResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Token')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = true)),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Error')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = true)),
+      ];
+}
 
 
 class _AuthenticationServiceClearOAuth2TokenParams extends bindings.Struct {
@@ -387,11 +453,55 @@ class _AuthenticationServiceClearOAuth2TokenParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _authentication_AuthenticationService_ClearOAuth2Token_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_AuthenticationServiceClearOAuth2TokenParams'
+      ..fullIdentifier = 'authentication._AuthenticationServiceClearOAuth2TokenParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Token')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)),
+      ];
+}
+
 
 const int _AuthenticationService_selectAccountName = 0;
 const int _AuthenticationService_getOAuth2TokenName = 1;
 const int _AuthenticationService_clearOAuth2TokenName = 2;
 
+mojom_types.MojomInterface _authentication_AuthenticationService__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'AuthenticationService'
+      ..fullIdentifier = 'authentication.AuthenticationService')
+    ..interfaceName = 'AuthenticationService'
+    ..methods = <int, mojom_types.MojomMethod>{
+_AuthenticationService_selectAccountName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'SelectAccount')
+        ..ordinal = _AuthenticationService_selectAccountName
+        ..responseParams = _authentication_AuthenticationService_SelectAccount_ResponseParams__()..parameters = _authentication_AuthenticationService_SelectAccount_Params__(),_AuthenticationService_getOAuth2TokenName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'GetOAuth2Token')
+        ..ordinal = _AuthenticationService_getOAuth2TokenName
+        ..responseParams = _authentication_AuthenticationService_GetOAuth2Token_ResponseParams__()..parameters = _authentication_AuthenticationService_GetOAuth2Token_Params__(),_AuthenticationService_clearOAuth2TokenName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'ClearOAuth2Token')
+        ..ordinal = _AuthenticationService_clearOAuth2TokenName..parameters = _authentication_AuthenticationService_ClearOAuth2Token_Params__(),
+    };
+}
+
+class _AuthenticationServiceServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _authentication_AuthenticationService__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class AuthenticationService {
   static const String serviceName = "authentication::AuthenticationService";
   dynamic selectAccount(bool returnLastSelected,[Function responseFactory = null]);
@@ -415,6 +525,9 @@ class _AuthenticationServiceProxyImpl extends bindings.Proxy {
     return new _AuthenticationServiceProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _AuthenticationServiceServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _AuthenticationService_selectAccountName:
@@ -673,6 +786,47 @@ class AuthenticationServiceStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _AuthenticationServiceServiceDescription();
 }
 
 
+
+
+
+
+
+Map<String, mojom_types.UserDefinedType> _initDescriptions() {
+  var map = new HashMap<String, mojom_types.UserDefinedType>();
+map["_authentication_AuthenticationService_SelectAccount_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _authentication_AuthenticationService_SelectAccount_Params__();
+map["_authentication_AuthenticationService_SelectAccount_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _authentication_AuthenticationService_SelectAccount_ResponseParams__();
+map["_authentication_AuthenticationService_GetOAuth2Token_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _authentication_AuthenticationService_GetOAuth2Token_Params__();
+map["_authentication_AuthenticationService_GetOAuth2Token_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _authentication_AuthenticationService_GetOAuth2Token_ResponseParams__();
+map["_authentication_AuthenticationService_ClearOAuth2Token_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _authentication_AuthenticationService_ClearOAuth2Token_Params__();
+map["_authentication_AuthenticationService__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _authentication_AuthenticationService__();
+
+  return map;
+}
+
+var _MojomDesc;
+Map<String, mojom_types.UserDefinedType> getAllMojomTypeDefinitions() {
+  if (_MojomDesc == null) {
+    _MojomDesc = _initDescriptions();
+  }
+  return _MojomDesc;
+}
+