Dart: Futures -> Callbacks.

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 library activity_mojom;
 import 'dart:async';
 import 'package:mojo/bindings.dart' as bindings;
 import 'package:mojo/core.dart' as core;
 import 'package:mojo/mojo/bindings/types/service_describer.mojom.dart' as service_describer;
 
@@ skipping 265 matching lines @@
 
 class StringExtra extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
   ];
   String name = null;
   String value = null;
 
   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);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static StringExtra decode(bindings.Decoder decoder0) {
@@ skipping 66 matching lines @@
 
 class ComponentName extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
   ];
   String packageName = null;
   String className = null;
 
   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);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static ComponentName decode(bindings.Decoder decoder0) {
@@ skipping 70 matching lines @@
   ];
   String action = null;
   String url = null;
   int flags = 0;
   ComponentName component = null;
   List<StringExtra> stringExtras = null;
   String type = null;
 
   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);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static Intent decode(bindings.Decoder decoder0) {
@@ skipping 137 matching lines @@
 
 class TaskDescription extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
   ];
   String label = null;
   int primaryColor = 0;
 
   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);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static TaskDescription decode(bindings.Decoder decoder0) {
@@ skipping 65 matching lines @@
 
 
 class _ActivityGetUserFeedbackParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   UserFeedbackInterfaceRequest userFeedback = null;
 
   _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);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _ActivityGetUserFeedbackParams decode(bindings.Decoder decoder0) {
@@ skipping 51 matching lines @@
 
 
 class _ActivityStartActivityParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   Intent intent = null;
 
   _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);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _ActivityStartActivityParams decode(bindings.Decoder decoder0) {
@@ skipping 52 matching lines @@
 }
 
 
 class _ActivityFinishCurrentActivityParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   _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);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _ActivityFinishCurrentActivityParams decode(bindings.Decoder decoder0) {
@@ skipping 39 matching lines @@
 
 
 class _ActivitySetTaskDescriptionParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   TaskDescription description = null;
 
   _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);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _ActivitySetTaskDescriptionParams decode(bindings.Decoder decoder0) {
@@ skipping 53 matching lines @@
 
 
 class _ActivitySetSystemUiVisibilityParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   SystemUiVisibility visibility = null;
 
   _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);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _ActivitySetSystemUiVisibilityParams decode(bindings.Decoder decoder0) {
@@ skipping 56 matching lines @@
 
 
 class _ActivitySetRequestedOrientationParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   ScreenOrientation orientation = null;
 
   _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);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _ActivitySetRequestedOrientationParams decode(bindings.Decoder decoder0) {
@@ skipping 55 matching lines @@
 }
 
 
 class _PathServiceGetAppDataDirParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   _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);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _PathServiceGetAppDataDirParams decode(bindings.Decoder decoder0) {
@@ skipping 39 matching lines @@
 
 
 class PathServiceGetAppDataDirResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   String path = null;
 
   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);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static PathServiceGetAppDataDirResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 51 matching lines @@
 }
 
 
 class _PathServiceGetFilesDirParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   _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);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _PathServiceGetFilesDirParams decode(bindings.Decoder decoder0) {
@@ skipping 39 matching lines @@
 
 
 class PathServiceGetFilesDirResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   String path = null;
 
   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);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static PathServiceGetFilesDirResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 51 matching lines @@
 }
 
 
 class _PathServiceGetCacheDirParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   _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);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _PathServiceGetCacheDirParams decode(bindings.Decoder decoder0) {
@@ skipping 39 matching lines @@
 
 
 class PathServiceGetCacheDirResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   String path = null;
 
   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);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static PathServiceGetCacheDirResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 52 matching lines @@
 
 
 class _UserFeedbackPerformHapticFeedbackParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   HapticFeedbackType type = null;
 
   _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);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _UserFeedbackPerformHapticFeedbackParams decode(bindings.Decoder decoder0) {
@@ skipping 56 matching lines @@
 
 
 class _UserFeedbackPerformAuralFeedbackParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   AuralFeedbackType type = null;
 
   _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);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _UserFeedbackPerformAuralFeedbackParams decode(bindings.Decoder decoder0) {
@@ skipping 55 matching lines @@
 }
 
 const int _activityMethodGetUserFeedbackName = 0;
 const int _activityMethodStartActivityName = 1;
 const int _activityMethodFinishCurrentActivityName = 2;
 const int _activityMethodSetTaskDescriptionName = 3;
 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 {
   static const String serviceName = "activity::Activity";
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _ActivityServiceDescription();
     }
@@ skipping 203 matching lines @@
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _ActivityStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => Activity.serviceName;
 
 
 
-  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");
     }
     switch (message.header.type) {
       case _activityMethodGetUserFeedbackName:
         var params = _ActivityGetUserFeedbackParams.deserialize(
             message.payload);
         _impl.getUserFeedback(params.userFeedback);
         break;
@@ skipping 17 matching lines @@
         break;
       case _activityMethodSetRequestedOrientationName:
         var params = _ActivitySetRequestedOrientationParams.deserialize(
             message.payload);
         _impl.setRequestedOrientation(params.orientation);
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   Activity get impl => _impl;
   set impl(Activity d) {
     if (d == null) {
       throw new core.MojoApiError("$this: Cannot set a null implementation");
     }
     if (isBound && (_impl == null)) {
       beginHandlingEvents();
     }
@@ skipping 58 matching lines @@
   void setRequestedOrientation(ScreenOrientation orientation) {
     return impl.setRequestedOrientation(orientation);
   }
 }
 
 const int _pathServiceMethodGetAppDataDirName = 0;
 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 {
   static const String serviceName = "activity::PathService";
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _PathServiceServiceDescription();
     }
     return _cachedServiceDescription;
   }
 
   static PathServiceProxy connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     PathServiceProxy p = new PathServiceProxy.unbound();
     String name = serviceName ?? PathService.serviceName;
     if ((name == null) || name.isEmpty) {
       throw new core.MojoApiError(
           "If an interface has no ServiceName, then one must be provided.");
     }
     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
     implements bindings.MojoInterface<PathService>,
                PathService {
   factory PathServiceInterface([PathService impl]) =>
       new PathServiceStub.unbound(impl);
 
   factory PathServiceInterface.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint,
@@ skipping 29 matching lines @@
 
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _pathServiceMethodGetAppDataDirName:
         var r = PathServiceGetAppDataDirResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           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(
             message.payload);
         if (!message.header.hasRequestId) {
           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(
             message.payload);
         if (!message.header.hasRequestId) {
           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}");
         close(immediate: true);
         break;
     }
   }
 
   @override
   String toString() {
@@ skipping 24 matching lines @@
     return newMockedProxy;
   }
 
   static PathServiceProxy newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For PathServiceProxy"));
     return new PathServiceProxy.fromEndpoint(endpoint);
   }
 
 
-  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);
   }
 }
 
 class _PathServiceStubControl
     extends bindings.StubMessageHandler
     implements bindings.StubControl<PathService> {
   PathService _impl;
 
   _PathServiceStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [PathService impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _PathServiceStubControl.fromHandle(
       core.MojoHandle handle, [PathService impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _PathServiceStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => PathService.serviceName;
 
 
-  static PathServiceGetAppDataDirResponseParams _pathServiceGetAppDataDirResponseParamsFactory(String path) {
-    var result = new PathServiceGetAppDataDirResponseParams();
-    result.path = path;
-    return result;
+  Function _pathServiceGetAppDataDirResponseParamsResponder(
+      int requestId) {
+  return (String path) {
+      var result = new PathServiceGetAppDataDirResponseParams();
+      result.path = path;
+      sendResponse(buildResponseWithId(
+          result,
+          _pathServiceMethodGetAppDataDirName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
-  static PathServiceGetFilesDirResponseParams _pathServiceGetFilesDirResponseParamsFactory(String path) {
-    var result = new PathServiceGetFilesDirResponseParams();
-    result.path = path;
-    return result;
+  Function _pathServiceGetFilesDirResponseParamsResponder(
+      int requestId) {
+  return (String path) {
+      var result = new PathServiceGetFilesDirResponseParams();
+      result.path = path;
+      sendResponse(buildResponseWithId(
+          result,
+          _pathServiceMethodGetFilesDirName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
-  static PathServiceGetCacheDirResponseParams _pathServiceGetCacheDirResponseParamsFactory(String path) {
-    var result = new PathServiceGetCacheDirResponseParams();
-    result.path = path;
-    return result;
+  Function _pathServiceGetCacheDirResponseParamsResponder(
+      int requestId) {
+  return (String path) {
+      var result = new PathServiceGetCacheDirResponseParams();
+      result.path = path;
+      sendResponse(buildResponseWithId(
+          result,
+          _pathServiceMethodGetCacheDirName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
 
-  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");
     }
     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;
   set impl(PathService d) {
     if (d == null) {
       throw new core.MojoApiError("$this: Cannot set a null implementation");
     }
     if (isBound && (_impl == null)) {
       beginHandlingEvents();
     }
@@ skipping 33 matching lines @@
       core.MojoHandle handle, [PathService impl])
       : super(new _PathServiceStubControl.fromHandle(handle, impl));
 
   static PathServiceStub newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For PathServiceStub"));
     return new PathServiceStub.fromEndpoint(endpoint);
   }
 
 
-  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);
   }
 }
 
 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 {
   static const String serviceName = null;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _UserFeedbackServiceDescription();
     }
@@ skipping 144 matching lines @@
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _UserFeedbackStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => UserFeedback.serviceName;
 
 
 
-  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");
     }
     switch (message.header.type) {
       case _userFeedbackMethodPerformHapticFeedbackName:
         var params = _UserFeedbackPerformHapticFeedbackParams.deserialize(
             message.payload);
         _impl.performHapticFeedback(params.type);
         break;
       case _userFeedbackMethodPerformAuralFeedbackName:
         var params = _UserFeedbackPerformAuralFeedbackParams.deserialize(
             message.payload);
         _impl.performAuralFeedback(params.type);
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   UserFeedback get impl => _impl;
   set impl(UserFeedback d) {
     if (d == null) {
       throw new core.MojoApiError("$this: Cannot set a null implementation");
     }
     if (isBound && (_impl == null)) {
       beginHandlingEvents();
     }
@@ skipping 43 matching lines @@
   void performHapticFeedback(HapticFeedbackType type) {
     return impl.performHapticFeedback(type);
   }
   void performAuralFeedback(AuralFeedbackType type) {
     return impl.performAuralFeedback(type);
   }
 }