Dart: Futures -> Callbacks.

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 43a4932b53a598e5d20ff523ba319d038955b381..392f90c0ab8abaf27dc513dc8e5e6179b00677ab 100644
--- a/mojo/dart/packages/mojo_services/lib/activity/activity.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/activity/activity.mojom.dart
@@ -283,6 +283,11 @@ class StringExtra extends bindings.Struct {
 
   StringExtra() : super(kVersions.last.size);
 
+  StringExtra.init(
+    String this.name, 
+    String this.value
+  ) : super(kVersions.last.size);
+
   static StringExtra deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -369,6 +374,11 @@ class ComponentName extends bindings.Struct {
 
   ComponentName() : super(kVersions.last.size);
 
+  ComponentName.init(
+    String this.packageName, 
+    String this.className
+  ) : super(kVersions.last.size);
+
   static ComponentName deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -459,6 +469,15 @@ class Intent extends bindings.Struct {
 
   Intent() : super(kVersions.last.size);
 
+  Intent.init(
+    String this.action, 
+    String this.url, 
+    int this.flags, 
+    ComponentName this.component, 
+    List<StringExtra> this.stringExtras, 
+    String this.type
+  ) : super(kVersions.last.size);
+
   static Intent deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -616,6 +635,11 @@ class TaskDescription extends bindings.Struct {
 
   TaskDescription() : super(kVersions.last.size);
 
+  TaskDescription.init(
+    String this.label, 
+    int this.primaryColor
+  ) : super(kVersions.last.size);
+
   static TaskDescription deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -701,6 +725,10 @@ class _ActivityGetUserFeedbackParams extends bindings.Struct {
 
   _ActivityGetUserFeedbackParams() : super(kVersions.last.size);
 
+  _ActivityGetUserFeedbackParams.init(
+    UserFeedbackInterfaceRequest this.userFeedback
+  ) : super(kVersions.last.size);
+
   static _ActivityGetUserFeedbackParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -772,6 +800,10 @@ class _ActivityStartActivityParams extends bindings.Struct {
 
   _ActivityStartActivityParams() : super(kVersions.last.size);
 
+  _ActivityStartActivityParams.init(
+    Intent this.intent
+  ) : super(kVersions.last.size);
+
   static _ActivityStartActivityParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -844,6 +876,9 @@ class _ActivityFinishCurrentActivityParams extends bindings.Struct {
 
   _ActivityFinishCurrentActivityParams() : super(kVersions.last.size);
 
+  _ActivityFinishCurrentActivityParams.init(
+  ) : super(kVersions.last.size);
+
   static _ActivityFinishCurrentActivityParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -903,6 +938,10 @@ class _ActivitySetTaskDescriptionParams extends bindings.Struct {
 
   _ActivitySetTaskDescriptionParams() : super(kVersions.last.size);
 
+  _ActivitySetTaskDescriptionParams.init(
+    TaskDescription this.description
+  ) : super(kVersions.last.size);
+
   static _ActivitySetTaskDescriptionParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -976,6 +1015,10 @@ class _ActivitySetSystemUiVisibilityParams extends bindings.Struct {
 
   _ActivitySetSystemUiVisibilityParams() : super(kVersions.last.size);
 
+  _ActivitySetSystemUiVisibilityParams.init(
+    SystemUiVisibility this.visibility
+  ) : super(kVersions.last.size);
+
   static _ActivitySetSystemUiVisibilityParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -1052,6 +1095,10 @@ class _ActivitySetRequestedOrientationParams extends bindings.Struct {
 
   _ActivitySetRequestedOrientationParams() : super(kVersions.last.size);
 
+  _ActivitySetRequestedOrientationParams.init(
+    ScreenOrientation this.orientation
+  ) : super(kVersions.last.size);
+
   static _ActivitySetRequestedOrientationParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -1127,6 +1174,9 @@ class _PathServiceGetAppDataDirParams extends bindings.Struct {
 
   _PathServiceGetAppDataDirParams() : super(kVersions.last.size);
 
+  _PathServiceGetAppDataDirParams.init(
+  ) : super(kVersions.last.size);
+
   static _PathServiceGetAppDataDirParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -1186,6 +1236,10 @@ class PathServiceGetAppDataDirResponseParams extends bindings.Struct {
 
   PathServiceGetAppDataDirResponseParams() : super(kVersions.last.size);
 
+  PathServiceGetAppDataDirResponseParams.init(
+    String this.path
+  ) : super(kVersions.last.size);
+
   static PathServiceGetAppDataDirResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -1257,6 +1311,9 @@ class _PathServiceGetFilesDirParams extends bindings.Struct {
 
   _PathServiceGetFilesDirParams() : super(kVersions.last.size);
 
+  _PathServiceGetFilesDirParams.init(
+  ) : super(kVersions.last.size);
+
   static _PathServiceGetFilesDirParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -1316,6 +1373,10 @@ class PathServiceGetFilesDirResponseParams extends bindings.Struct {
 
   PathServiceGetFilesDirResponseParams() : super(kVersions.last.size);
 
+  PathServiceGetFilesDirResponseParams.init(
+    String this.path
+  ) : super(kVersions.last.size);
+
   static PathServiceGetFilesDirResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -1387,6 +1448,9 @@ class _PathServiceGetCacheDirParams extends bindings.Struct {
 
   _PathServiceGetCacheDirParams() : super(kVersions.last.size);
 
+  _PathServiceGetCacheDirParams.init(
+  ) : super(kVersions.last.size);
+
   static _PathServiceGetCacheDirParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -1446,6 +1510,10 @@ class PathServiceGetCacheDirResponseParams extends bindings.Struct {
 
   PathServiceGetCacheDirResponseParams() : super(kVersions.last.size);
 
+  PathServiceGetCacheDirResponseParams.init(
+    String this.path
+  ) : super(kVersions.last.size);
+
   static PathServiceGetCacheDirResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -1518,6 +1586,10 @@ class _UserFeedbackPerformHapticFeedbackParams extends bindings.Struct {
 
   _UserFeedbackPerformHapticFeedbackParams() : super(kVersions.last.size);
 
+  _UserFeedbackPerformHapticFeedbackParams.init(
+    HapticFeedbackType this.type
+  ) : super(kVersions.last.size);
+
   static _UserFeedbackPerformHapticFeedbackParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -1594,6 +1666,10 @@ class _UserFeedbackPerformAuralFeedbackParams extends bindings.Struct {
 
   _UserFeedbackPerformAuralFeedbackParams() : super(kVersions.last.size);
 
+  _UserFeedbackPerformAuralFeedbackParams.init(
+    AuralFeedbackType this.type
+  ) : super(kVersions.last.size);
+
   static _UserFeedbackPerformAuralFeedbackParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -1669,14 +1745,17 @@ const int _activityMethodSetSystemUiVisibilityName = 4;
 const int _activityMethodSetRequestedOrientationName = 5;
 
 class _ActivityServiceDescription implements service_describer.ServiceDescription {
-  dynamic getTopLevelInterface([Function responseFactory]) =>
-      responseFactory(null);
+  void getTopLevelInterface(Function responder) {
+    responder(null);
+  }
 
-  dynamic getTypeDefinition(String typeKey, [Function responseFactory]) =>
-      responseFactory(null);
+  void getTypeDefinition(String typeKey, Function responder) {
+    responder(null);
+  }
 
-  dynamic getAllTypeDefinitions([Function responseFactory]) =>
-      responseFactory(null);
+  void getAllTypeDefinitions(Function responder) {
+    responder(null);
+  }
 }
 
 abstract class Activity {
@@ -1900,11 +1979,11 @@ class _ActivityStubControl
 
 
 
-  dynamic handleMessage(bindings.ServiceMessage message) {
+  void handleMessage(bindings.ServiceMessage message) {
     if (bindings.ControlMessageHandler.isControlMessage(message)) {
-      return bindings.ControlMessageHandler.handleMessage(this,
-                                                          0,
-                                                          message);
+      bindings.ControlMessageHandler.handleMessage(
+          this, 0, message);
+      return;
     }
     if (_impl == null) {
       throw new core.MojoApiError("$this has no implementation set");
@@ -1942,7 +2021,6 @@ class _ActivityStubControl
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   Activity get impl => _impl;
@@ -2021,14 +2099,17 @@ const int _pathServiceMethodGetFilesDirName = 1;
 const int _pathServiceMethodGetCacheDirName = 2;
 
 class _PathServiceServiceDescription implements service_describer.ServiceDescription {
-  dynamic getTopLevelInterface([Function responseFactory]) =>
-      responseFactory(null);
+  void getTopLevelInterface(Function responder) {
+    responder(null);
+  }
 
-  dynamic getTypeDefinition(String typeKey, [Function responseFactory]) =>
-      responseFactory(null);
+  void getTypeDefinition(String typeKey, Function responder) {
+    responder(null);
+  }
 
-  dynamic getAllTypeDefinitions([Function responseFactory]) =>
-      responseFactory(null);
+  void getAllTypeDefinitions(Function responder) {
+    responder(null);
+  }
 }
 
 abstract class PathService {
@@ -2053,9 +2134,9 @@ abstract class PathService {
     s.connectToService(url, p, name);
     return p;
   }
-  dynamic getAppDataDir([Function responseFactory = null]);
-  dynamic getFilesDir([Function responseFactory = null]);
-  dynamic getCacheDir([Function responseFactory = null]);
+  void getAppDataDir(void callback(String path));
+  void getFilesDir(void callback(String path));
+  void getCacheDir(void callback(String path));
 }
 
 abstract class PathServiceInterface
@@ -2105,18 +2186,14 @@ class _PathServiceProxyControl
           proxyError("Expected a message with a valid request Id.");
           return;
         }
-        Completer c = completerMap[message.header.requestId];
-        if (c == null) {
+        Function callback = callbackMap[message.header.requestId];
+        if (callback == null) {
           proxyError(
               "Message had unknown request Id: ${message.header.requestId}");
           return;
         }
-        completerMap.remove(message.header.requestId);
-        if (c.isCompleted) {
-          proxyError("Response completer already completed");
-          return;
-        }
-        c.complete(r);
+        callbackMap.remove(message.header.requestId);
+        callback(r.path );
         break;
       case _pathServiceMethodGetFilesDirName:
         var r = PathServiceGetFilesDirResponseParams.deserialize(
@@ -2125,18 +2202,14 @@ class _PathServiceProxyControl
           proxyError("Expected a message with a valid request Id.");
           return;
         }
-        Completer c = completerMap[message.header.requestId];
-        if (c == null) {
+        Function callback = callbackMap[message.header.requestId];
+        if (callback == null) {
           proxyError(
               "Message had unknown request Id: ${message.header.requestId}");
           return;
         }
-        completerMap.remove(message.header.requestId);
-        if (c.isCompleted) {
-          proxyError("Response completer already completed");
-          return;
-        }
-        c.complete(r);
+        callbackMap.remove(message.header.requestId);
+        callback(r.path );
         break;
       case _pathServiceMethodGetCacheDirName:
         var r = PathServiceGetCacheDirResponseParams.deserialize(
@@ -2145,18 +2218,14 @@ class _PathServiceProxyControl
           proxyError("Expected a message with a valid request Id.");
           return;
         }
-        Completer c = completerMap[message.header.requestId];
-        if (c == null) {
+        Function callback = callbackMap[message.header.requestId];
+        if (callback == null) {
           proxyError(
               "Message had unknown request Id: ${message.header.requestId}");
           return;
         }
-        completerMap.remove(message.header.requestId);
-        if (c.isCompleted) {
-          proxyError("Response completer already completed");
-          return;
-        }
-        c.complete(r);
+        callbackMap.remove(message.header.requestId);
+        callback(r.path );
         break;
       default:
         proxyError("Unexpected message type: ${message.header.type}");
@@ -2201,38 +2270,44 @@ class PathServiceProxy
   }
 
 
-  dynamic getAppDataDir([Function responseFactory = null]) {
+  void getAppDataDir(void callback(String path)) {
     if (impl != null) {
-      return new Future(() => impl.getAppDataDir(_PathServiceStubControl._pathServiceGetAppDataDirResponseParamsFactory));
+      impl.getAppDataDir(callback);
+      return;
     }
     var params = new _PathServiceGetAppDataDirParams();
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _pathServiceMethodGetAppDataDirName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
-  dynamic getFilesDir([Function responseFactory = null]) {
+  void getFilesDir(void callback(String path)) {
     if (impl != null) {
-      return new Future(() => impl.getFilesDir(_PathServiceStubControl._pathServiceGetFilesDirResponseParamsFactory));
+      impl.getFilesDir(callback);
+      return;
     }
     var params = new _PathServiceGetFilesDirParams();
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _pathServiceMethodGetFilesDirName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
-  dynamic getCacheDir([Function responseFactory = null]) {
+  void getCacheDir(void callback(String path)) {
     if (impl != null) {
-      return new Future(() => impl.getCacheDir(_PathServiceStubControl._pathServiceGetCacheDirResponseParamsFactory));
+      impl.getCacheDir(callback);
+      return;
     }
     var params = new _PathServiceGetCacheDirParams();
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _pathServiceMethodGetCacheDirName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
 }
 
@@ -2258,97 +2333,66 @@ class _PathServiceStubControl
   String get serviceName => PathService.serviceName;
 
 
-  static PathServiceGetAppDataDirResponseParams _pathServiceGetAppDataDirResponseParamsFactory(String path) {
-    var result = new PathServiceGetAppDataDirResponseParams();
-    result.path = path;
-    return result;
-  }
-  static PathServiceGetFilesDirResponseParams _pathServiceGetFilesDirResponseParamsFactory(String path) {
-    var result = new PathServiceGetFilesDirResponseParams();
-    result.path = path;
-    return result;
-  }
-  static PathServiceGetCacheDirResponseParams _pathServiceGetCacheDirResponseParamsFactory(String path) {
-    var result = new PathServiceGetCacheDirResponseParams();
-    result.path = path;
-    return result;
-  }
-
-  dynamic handleMessage(bindings.ServiceMessage message) {
+  Function _pathServiceGetAppDataDirResponseParamsResponder(
+      int requestId) {
+  return (String path) {
+      var result = new PathServiceGetAppDataDirResponseParams();
+      result.path = path;
+      sendResponse(buildResponseWithId(
+          result,
+          _pathServiceMethodGetAppDataDirName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
+  }
+  Function _pathServiceGetFilesDirResponseParamsResponder(
+      int requestId) {
+  return (String path) {
+      var result = new PathServiceGetFilesDirResponseParams();
+      result.path = path;
+      sendResponse(buildResponseWithId(
+          result,
+          _pathServiceMethodGetFilesDirName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
+  }
+  Function _pathServiceGetCacheDirResponseParamsResponder(
+      int requestId) {
+  return (String path) {
+      var result = new PathServiceGetCacheDirResponseParams();
+      result.path = path;
+      sendResponse(buildResponseWithId(
+          result,
+          _pathServiceMethodGetCacheDirName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
+  }
+
+  void handleMessage(bindings.ServiceMessage message) {
     if (bindings.ControlMessageHandler.isControlMessage(message)) {
-      return bindings.ControlMessageHandler.handleMessage(this,
-                                                          0,
-                                                          message);
+      bindings.ControlMessageHandler.handleMessage(
+          this, 0, message);
+      return;
     }
     if (_impl == null) {
       throw new core.MojoApiError("$this has no implementation set");
     }
     switch (message.header.type) {
       case _pathServiceMethodGetAppDataDirName:
-        var response = _impl.getAppDataDir(_pathServiceGetAppDataDirResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _pathServiceMethodGetAppDataDirName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _pathServiceMethodGetAppDataDirName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.getAppDataDir(_pathServiceGetAppDataDirResponseParamsResponder(message.header.requestId));
         break;
       case _pathServiceMethodGetFilesDirName:
-        var response = _impl.getFilesDir(_pathServiceGetFilesDirResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _pathServiceMethodGetFilesDirName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _pathServiceMethodGetFilesDirName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.getFilesDir(_pathServiceGetFilesDirResponseParamsResponder(message.header.requestId));
         break;
       case _pathServiceMethodGetCacheDirName:
-        var response = _impl.getCacheDir(_pathServiceGetCacheDirResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _pathServiceMethodGetCacheDirName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _pathServiceMethodGetCacheDirName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.getCacheDir(_pathServiceGetCacheDirResponseParamsResponder(message.header.requestId));
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   PathService get impl => _impl;
@@ -2402,14 +2446,14 @@ class PathServiceStub
   }
 
 
-  dynamic getAppDataDir([Function responseFactory = null]) {
-    return impl.getAppDataDir(responseFactory);
+  void getAppDataDir(void callback(String path)) {
+    return impl.getAppDataDir(callback);
   }
-  dynamic getFilesDir([Function responseFactory = null]) {
-    return impl.getFilesDir(responseFactory);
+  void getFilesDir(void callback(String path)) {
+    return impl.getFilesDir(callback);
   }
-  dynamic getCacheDir([Function responseFactory = null]) {
-    return impl.getCacheDir(responseFactory);
+  void getCacheDir(void callback(String path)) {
+    return impl.getCacheDir(callback);
   }
 }
 
@@ -2417,14 +2461,17 @@ const int _userFeedbackMethodPerformHapticFeedbackName = 0;
 const int _userFeedbackMethodPerformAuralFeedbackName = 1;
 
 class _UserFeedbackServiceDescription implements service_describer.ServiceDescription {
-  dynamic getTopLevelInterface([Function responseFactory]) =>
-      responseFactory(null);
+  void getTopLevelInterface(Function responder) {
+    responder(null);
+  }
 
-  dynamic getTypeDefinition(String typeKey, [Function responseFactory]) =>
-      responseFactory(null);
+  void getTypeDefinition(String typeKey, Function responder) {
+    responder(null);
+  }
 
-  dynamic getAllTypeDefinitions([Function responseFactory]) =>
-      responseFactory(null);
+  void getAllTypeDefinitions(Function responder) {
+    responder(null);
+  }
 }
 
 abstract class UserFeedback {
@@ -2589,11 +2636,11 @@ class _UserFeedbackStubControl
 
 
 
-  dynamic handleMessage(bindings.ServiceMessage message) {
+  void handleMessage(bindings.ServiceMessage message) {
     if (bindings.ControlMessageHandler.isControlMessage(message)) {
-      return bindings.ControlMessageHandler.handleMessage(this,
-                                                          0,
-                                                          message);
+      bindings.ControlMessageHandler.handleMessage(
+          this, 0, message);
+      return;
     }
     if (_impl == null) {
       throw new core.MojoApiError("$this has no implementation set");
@@ -2613,7 +2660,6 @@ class _UserFeedbackStubControl
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   UserFeedback get impl => _impl;