Generate Mojom Types in Dart (Take 2)

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

Index: mojo/dart/packages/mojo_services/lib/activity/activity.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/activity/activity.mojom.dart b/mojo/dart/packages/mojo_services/lib/activity/activity.mojom.dart
index 8ef40ded552be44ef7350575eb0e026b9b2324ec..ac05363b8cb20e027c7c79fd25560e59478bb056 100644
--- a/mojo/dart/packages/mojo_services/lib/activity/activity.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/activity/activity.mojom.dart
@@ -8,6 +8,8 @@ import 'dart:async';
 
 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;
 
 class SystemUiVisibility extends bindings.MojoEnum {
   static const SystemUiVisibility standard = const SystemUiVisibility._(0);
@@ -60,12 +62,16 @@ class SystemUiVisibility extends bindings.MojoEnum {
         return 'SystemUiVisibility.fullscreen';
       case immersive:
         return 'SystemUiVisibility.immersive';
+      default:
+        return null;
     }
   }
 
   int toJson() => mojoEnumValue;
 }
 
+
+
 class ScreenOrientation extends bindings.MojoEnum {
   static const ScreenOrientation unspecified = const ScreenOrientation._(0);
   static const ScreenOrientation landscape = const ScreenOrientation._(1);
@@ -124,12 +130,16 @@ class ScreenOrientation extends bindings.MojoEnum {
         return 'ScreenOrientation.portrait';
       case nosensor:
         return 'ScreenOrientation.nosensor';
+      default:
+        return null;
     }
   }
 
   int toJson() => mojoEnumValue;
 }
 
+
+
 class HapticFeedbackType extends bindings.MojoEnum {
   static const HapticFeedbackType longPress = const HapticFeedbackType._(0);
   static const HapticFeedbackType virtualKey = const HapticFeedbackType._(1);
@@ -188,12 +198,16 @@ class HapticFeedbackType extends bindings.MojoEnum {
         return 'HapticFeedbackType.keyboardTap';
       case clockTick:
         return 'HapticFeedbackType.clockTick';
+      default:
+        return null;
     }
   }
 
   int toJson() => mojoEnumValue;
 }
 
+
+
 class AuralFeedbackType extends bindings.MojoEnum {
   static const AuralFeedbackType click = const AuralFeedbackType._(0);
   static const AuralFeedbackType navigationLeft = const AuralFeedbackType._(1);
@@ -259,6 +273,8 @@ class AuralFeedbackType extends bindings.MojoEnum {
         return 'AuralFeedbackType.navigationRight';
       case navigationDown:
         return 'AuralFeedbackType.navigationDown';
+      default:
+        return null;
     }
   }
 
@@ -267,6 +283,8 @@ class AuralFeedbackType extends bindings.MojoEnum {
 
 
 
+
+
 class StringExtra extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
@@ -343,6 +361,8 @@ class StringExtra extends bindings.Struct {
 }
 
 
+
+
 class ComponentName extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
@@ -419,6 +439,8 @@ class ComponentName extends bindings.Struct {
 }
 
 
+
+
 class Intent extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(56, 0)
@@ -551,6 +573,8 @@ class Intent extends bindings.Struct {
 }
 
 
+
+
 class TaskDescription extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
@@ -627,6 +651,8 @@ class TaskDescription extends bindings.Struct {
 }
 
 
+
+
 class _ActivityGetUserFeedbackParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
@@ -693,6 +719,8 @@ class _ActivityGetUserFeedbackParams extends bindings.Struct {
 }
 
 
+
+
 class _ActivityStartActivityParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
@@ -761,6 +789,8 @@ class _ActivityStartActivityParams extends bindings.Struct {
 }
 
 
+
+
 class _ActivityFinishCurrentActivityParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
@@ -819,6 +849,8 @@ class _ActivityFinishCurrentActivityParams extends bindings.Struct {
 }
 
 
+
+
 class _ActivitySetTaskDescriptionParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
@@ -887,6 +919,8 @@ class _ActivitySetTaskDescriptionParams extends bindings.Struct {
 }
 
 
+
+
 class _ActivitySetSystemUiVisibilityParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
@@ -958,6 +992,8 @@ class _ActivitySetSystemUiVisibilityParams extends bindings.Struct {
 }
 
 
+
+
 class _ActivitySetRequestedOrientationParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
@@ -1029,6 +1065,8 @@ class _ActivitySetRequestedOrientationParams extends bindings.Struct {
 }
 
 
+
+
 class _PathServiceGetAppDataDirParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
@@ -1087,6 +1125,8 @@ class _PathServiceGetAppDataDirParams extends bindings.Struct {
 }
 
 
+
+
 class PathServiceGetAppDataDirResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
@@ -1154,6 +1194,8 @@ class PathServiceGetAppDataDirResponseParams extends bindings.Struct {
 }
 
 
+
+
 class _PathServiceGetFilesDirParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
@@ -1212,6 +1254,8 @@ class _PathServiceGetFilesDirParams extends bindings.Struct {
 }
 
 
+
+
 class PathServiceGetFilesDirResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
@@ -1279,6 +1323,8 @@ class PathServiceGetFilesDirResponseParams extends bindings.Struct {
 }
 
 
+
+
 class _PathServiceGetCacheDirParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
@@ -1337,6 +1383,8 @@ class _PathServiceGetCacheDirParams extends bindings.Struct {
 }
 
 
+
+
 class PathServiceGetCacheDirResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
@@ -1404,6 +1452,8 @@ class PathServiceGetCacheDirResponseParams extends bindings.Struct {
 }
 
 
+
+
 class _UserFeedbackPerformHapticFeedbackParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
@@ -1475,6 +1525,8 @@ class _UserFeedbackPerformHapticFeedbackParams extends bindings.Struct {
 }
 
 
+
+
 class _UserFeedbackPerformAuralFeedbackParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
@@ -1545,6 +1597,9 @@ class _UserFeedbackPerformAuralFeedbackParams extends bindings.Struct {
   }
 }
 
+
+
+
 const int _Activity_getUserFeedbackName = 0;
 const int _Activity_startActivityName = 1;
 const int _Activity_finishCurrentActivityName = 2;
@@ -1552,6 +1607,16 @@ const int _Activity_setTaskDescriptionName = 3;
 const int _Activity_setSystemUiVisibilityName = 4;
 const int _Activity_setRequestedOrientationName = 5;
 
+
+
+class _ActivityServiceDescription implements service_describer.ServiceDescription {
+  dynamic getTopLevelInterface([Function responseFactory]) => null;
+
+  dynamic getTypeDefinition(String typeKey, [Function responseFactory]) => null;
+
+  dynamic getAllTypeDefinitions([Function responseFactory]) => null;
+}
+
 abstract class Activity {
   static const String serviceName = "activity::Activity";
   void getUserFeedback(Object userFeedback);
@@ -1578,6 +1643,9 @@ class _ActivityProxyImpl extends bindings.Proxy {
     return new _ActivityProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _ActivityServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
@@ -1790,12 +1858,25 @@ class ActivityStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _ActivityServiceDescription();
 }
 
 const int _PathService_getAppDataDirName = 0;
 const int _PathService_getFilesDirName = 1;
 const int _PathService_getCacheDirName = 2;
 
+
+
+class _PathServiceServiceDescription implements service_describer.ServiceDescription {
+  dynamic getTopLevelInterface([Function responseFactory]) => null;
+
+  dynamic getTypeDefinition(String typeKey, [Function responseFactory]) => null;
+
+  dynamic getAllTypeDefinitions([Function responseFactory]) => null;
+}
+
 abstract class PathService {
   static const String serviceName = "activity::PathService";
   dynamic getAppDataDir([Function responseFactory = null]);
@@ -1819,6 +1900,9 @@ class _PathServiceProxyImpl extends bindings.Proxy {
     return new _PathServiceProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _PathServiceServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _PathService_getAppDataDirName:
@@ -2113,11 +2197,24 @@ class PathServiceStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _PathServiceServiceDescription();
 }
 
 const int _UserFeedback_performHapticFeedbackName = 0;
 const int _UserFeedback_performAuralFeedbackName = 1;
 
+
+
+class _UserFeedbackServiceDescription implements service_describer.ServiceDescription {
+  dynamic getTopLevelInterface([Function responseFactory]) => null;
+
+  dynamic getTypeDefinition(String typeKey, [Function responseFactory]) => null;
+
+  dynamic getAllTypeDefinitions([Function responseFactory]) => null;
+}
+
 abstract class UserFeedback {
   static const String serviceName = null;
   void performHapticFeedback(HapticFeedbackType type);
@@ -2140,6 +2237,9 @@ class _UserFeedbackProxyImpl extends bindings.Proxy {
     return new _UserFeedbackProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _UserFeedbackServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
@@ -2297,6 +2397,10 @@ class UserFeedbackStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _UserFeedbackServiceDescription();
 }
 
 
+