Dart: Futures -> Callbacks.

mojo/dart/packages/mojo_services/lib/mojo/ui/view_associates.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 view_associates_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;
 import 'package:mojo_services/mojo/gfx/composition/hit_tests.mojom.dart' as hit_tests_mojom;
 import 'package:mojo_services/mojo/gfx/composition/scene_token.mojom.dart' as scene_token_mojom;
 import 'package:mojo_services/mojo/ui/view_token.mojom.dart' as view_token_mojom;
 import 'package:mojo_services/mojo/ui/view_tree_token.mojom.dart' as view_tree_token_mojom;
 
 
 
 class ViewAssociateInfo extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
   ];
   List<String> viewServiceNames = null;
   List<String> viewTreeServiceNames = null;
 
   ViewAssociateInfo() : super(kVersions.last.size);
 
+  ViewAssociateInfo.init(
+    List<String> this.viewServiceNames, 
+    List<String> this.viewTreeServiceNames
+  ) : super(kVersions.last.size);
+
   static ViewAssociateInfo 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 ViewAssociateInfo decode(bindings.Decoder decoder0) {
@@ skipping 99 matching lines @@
 
 
 class _ViewAssociateConnectParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   ViewInspectorInterface inspector = null;
 
   _ViewAssociateConnectParams() : super(kVersions.last.size);
 
+  _ViewAssociateConnectParams.init(
+    ViewInspectorInterface this.inspector
+  ) : super(kVersions.last.size);
+
   static _ViewAssociateConnectParams 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 _ViewAssociateConnectParams decode(bindings.Decoder decoder0) {
@@ skipping 51 matching lines @@
 
 
 class ViewAssociateConnectResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   ViewAssociateInfo info = null;
 
   ViewAssociateConnectResponseParams() : super(kVersions.last.size);
 
+  ViewAssociateConnectResponseParams.init(
+    ViewAssociateInfo this.info
+  ) : super(kVersions.last.size);
+
   static ViewAssociateConnectResponseParams 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 ViewAssociateConnectResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 55 matching lines @@
 class _ViewAssociateConnectToViewServiceParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(32, 0)
   ];
   view_token_mojom.ViewToken viewToken = null;
   String serviceName_ = null;
   core.MojoMessagePipeEndpoint pipe = null;
 
   _ViewAssociateConnectToViewServiceParams() : super(kVersions.last.size);
 
+  _ViewAssociateConnectToViewServiceParams.init(
+    view_token_mojom.ViewToken this.viewToken, 
+    String this.serviceName_, 
+    core.MojoMessagePipeEndpoint this.pipe
+  ) : super(kVersions.last.size);
+
   static _ViewAssociateConnectToViewServiceParams 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 _ViewAssociateConnectToViewServiceParams decode(bindings.Decoder decoder0) {
@@ skipping 78 matching lines @@
 class _ViewAssociateConnectToViewTreeServiceParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(32, 0)
   ];
   view_tree_token_mojom.ViewTreeToken viewTreeToken = null;
   String serviceName_ = null;
   core.MojoMessagePipeEndpoint pipe = null;
 
   _ViewAssociateConnectToViewTreeServiceParams() : super(kVersions.last.size);
 
+  _ViewAssociateConnectToViewTreeServiceParams.init(
+    view_tree_token_mojom.ViewTreeToken this.viewTreeToken, 
+    String this.serviceName_, 
+    core.MojoMessagePipeEndpoint this.pipe
+  ) : super(kVersions.last.size);
+
   static _ViewAssociateConnectToViewTreeServiceParams 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 _ViewAssociateConnectToViewTreeServiceParams decode(bindings.Decoder decoder0) {
@@ skipping 77 matching lines @@
 
 class _ViewInspectorGetHitTesterParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
   ];
   view_tree_token_mojom.ViewTreeToken viewTreeToken = null;
   hit_tests_mojom.HitTesterInterfaceRequest hitTester = null;
 
   _ViewInspectorGetHitTesterParams() : super(kVersions.last.size);
 
+  _ViewInspectorGetHitTesterParams.init(
+    view_tree_token_mojom.ViewTreeToken this.viewTreeToken, 
+    hit_tests_mojom.HitTesterInterfaceRequest this.hitTester
+  ) : super(kVersions.last.size);
+
   static _ViewInspectorGetHitTesterParams 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 _ViewInspectorGetHitTesterParams decode(bindings.Decoder decoder0) {
@@ skipping 64 matching lines @@
 
 
 class ViewInspectorGetHitTesterResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   bool rendererChanged = false;
 
   ViewInspectorGetHitTesterResponseParams() : super(kVersions.last.size);
 
+  ViewInspectorGetHitTesterResponseParams.init(
+    bool this.rendererChanged
+  ) : super(kVersions.last.size);
+
   static ViewInspectorGetHitTesterResponseParams 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 ViewInspectorGetHitTesterResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 52 matching lines @@
 
 
 class _ViewInspectorResolveScenesParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   List<scene_token_mojom.SceneToken> sceneTokens = null;
 
   _ViewInspectorResolveScenesParams() : super(kVersions.last.size);
 
+  _ViewInspectorResolveScenesParams.init(
+    List<scene_token_mojom.SceneToken> this.sceneTokens
+  ) : super(kVersions.last.size);
+
   static _ViewInspectorResolveScenesParams 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 _ViewInspectorResolveScenesParams decode(bindings.Decoder decoder0) {
@@ skipping 68 matching lines @@
 
 
 class ViewInspectorResolveScenesResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   List<view_token_mojom.ViewToken> viewTokens = null;
 
   ViewInspectorResolveScenesResponseParams() : super(kVersions.last.size);
 
+  ViewInspectorResolveScenesResponseParams.init(
+    List<view_token_mojom.ViewToken> this.viewTokens
+  ) : super(kVersions.last.size);
+
   static ViewInspectorResolveScenesResponseParams 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 ViewInspectorResolveScenesResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 64 matching lines @@
     map["viewTokens"] = viewTokens;
     return map;
   }
 }
 
 const int _viewAssociateMethodConnectName = 0;
 const int _viewAssociateMethodConnectToViewServiceName = 1;
 const int _viewAssociateMethodConnectToViewTreeServiceName = 2;
 
 class _ViewAssociateServiceDescription 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 ViewAssociate {
   static const String serviceName = "mojo::ui::ViewAssociate";
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _ViewAssociateServiceDescription();
     }
     return _cachedServiceDescription;
   }
 
   static ViewAssociateProxy connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     ViewAssociateProxy p = new ViewAssociateProxy.unbound();
     String name = serviceName ?? ViewAssociate.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 connect(ViewInspectorInterface inspector,[Function responseFactory = null]);
+  void connect(ViewInspectorInterface inspector,void callback(ViewAssociateInfo info));
   void connectToViewService(view_token_mojom.ViewToken viewToken, String serviceName_, core.MojoMessagePipeEndpoint pipe);
   void connectToViewTreeService(view_tree_token_mojom.ViewTreeToken viewTreeToken, String serviceName_, core.MojoMessagePipeEndpoint pipe);
 }
 
 abstract class ViewAssociateInterface
     implements bindings.MojoInterface<ViewAssociate>,
                ViewAssociate {
   factory ViewAssociateInterface([ViewAssociate impl]) =>
       new ViewAssociateStub.unbound(impl);
   factory ViewAssociateInterface.fromEndpoint(
@@ skipping 24 matching lines @@
 
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _viewAssociateMethodConnectName:
         var r = ViewAssociateConnectResponseParams.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.info );
         break;
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
   ViewAssociate get impl => null;
   set impl(ViewAssociate _) {
@@ skipping 22 matching lines @@
   ViewAssociateProxy.unbound()
       : super(new _ViewAssociateProxyControl.unbound());
 
   static ViewAssociateProxy newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For ViewAssociateProxy"));
     return new ViewAssociateProxy.fromEndpoint(endpoint);
   }
 
 
-  dynamic connect(ViewInspectorInterface inspector,[Function responseFactory = null]) {
+  void connect(ViewInspectorInterface inspector,void callback(ViewAssociateInfo info)) {
     var params = new _ViewAssociateConnectParams();
     params.inspector = inspector;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _viewAssociateMethodConnectName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
   void connectToViewService(view_token_mojom.ViewToken viewToken, String serviceName_, core.MojoMessagePipeEndpoint pipe) {
     if (!ctrl.isBound) {
       ctrl.proxyError("The Proxy is closed.");
       return;
     }
     var params = new _ViewAssociateConnectToViewServiceParams();
     params.viewToken = viewToken;
     params.serviceName_ = serviceName_;
     params.pipe = pipe;
@@ skipping 29 matching lines @@
       core.MojoHandle handle, [ViewAssociate impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _ViewAssociateStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => ViewAssociate.serviceName;
 
 
-  ViewAssociateConnectResponseParams _viewAssociateConnectResponseParamsFactory(ViewAssociateInfo info) {
-    var result = new ViewAssociateConnectResponseParams();
-    result.info = info;
-    return result;
+  Function _viewAssociateConnectResponseParamsResponder(
+      int requestId) {
+  return (ViewAssociateInfo info) {
+      var result = new ViewAssociateConnectResponseParams();
+      result.info = info;
+      sendResponse(buildResponseWithId(
+          result,
+          _viewAssociateMethodConnectName,
+          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 _viewAssociateMethodConnectName:
         var params = _ViewAssociateConnectParams.deserialize(
             message.payload);
-        var response = _impl.connect(params.inspector,_viewAssociateConnectResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _viewAssociateMethodConnectName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _viewAssociateMethodConnectName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.connect(params.inspector, _viewAssociateConnectResponseParamsResponder(message.header.requestId));
         break;
       case _viewAssociateMethodConnectToViewServiceName:
         var params = _ViewAssociateConnectToViewServiceParams.deserialize(
             message.payload);
         _impl.connectToViewService(params.viewToken, params.serviceName_, params.pipe);
         break;
       case _viewAssociateMethodConnectToViewTreeServiceName:
         var params = _ViewAssociateConnectToViewTreeServiceParams.deserialize(
             message.payload);
         _impl.connectToViewTreeService(params.viewTreeToken, params.serviceName_, params.pipe);
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   ViewAssociate get impl => _impl;
   set impl(ViewAssociate 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, [ViewAssociate impl])
       : super(new _ViewAssociateStubControl.fromHandle(handle, impl));
 
   static ViewAssociateStub newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For ViewAssociateStub"));
     return new ViewAssociateStub.fromEndpoint(endpoint);
   }
 
 
-  dynamic connect(ViewInspectorInterface inspector,[Function responseFactory = null]) {
-    return impl.connect(inspector,responseFactory);
+  void connect(ViewInspectorInterface inspector,void callback(ViewAssociateInfo info)) {
+    return impl.connect(inspector,callback);
   }
   void connectToViewService(view_token_mojom.ViewToken viewToken, String serviceName_, core.MojoMessagePipeEndpoint pipe) {
     return impl.connectToViewService(viewToken, serviceName_, pipe);
   }
   void connectToViewTreeService(view_tree_token_mojom.ViewTreeToken viewTreeToken, String serviceName_, core.MojoMessagePipeEndpoint pipe) {
     return impl.connectToViewTreeService(viewTreeToken, serviceName_, pipe);
   }
 }
 
 
 class _ViewAssociateOwnerServiceDescription 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 ViewAssociateOwner {
   static const String serviceName = "mojo::ui::ViewAssociateOwner";
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _ViewAssociateOwnerServiceDescription();
     }
@@ skipping 105 matching lines @@
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _ViewAssociateOwnerStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => ViewAssociateOwner.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) {
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   ViewAssociateOwner get impl => _impl;
   set impl(ViewAssociateOwner d) {
     if (d == null) {
       throw new core.MojoApiError("$this: Cannot set a null implementation");
     }
     if (isBound && (_impl == null)) {
       beginHandlingEvents();
     }
@@ skipping 39 matching lines @@
     return new ViewAssociateOwnerStub.fromEndpoint(endpoint);
   }
 
 
 }
 
 const int _viewInspectorMethodGetHitTesterName = 0;
 const int _viewInspectorMethodResolveScenesName = 1;
 
 class _ViewInspectorServiceDescription 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 ViewInspector {
   static const String serviceName = null;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _ViewInspectorServiceDescription();
     }
     return _cachedServiceDescription;
   }
 
   static ViewInspectorProxy connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     ViewInspectorProxy p = new ViewInspectorProxy.unbound();
     String name = serviceName ?? ViewInspector.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 getHitTester(view_tree_token_mojom.ViewTreeToken viewTreeToken,hit_tests_mojom.HitTesterInterfaceRequest hitTester,[Function responseFactory = null]);
-  dynamic resolveScenes(List<scene_token_mojom.SceneToken> sceneTokens,[Function responseFactory = null]);
+  void getHitTester(view_tree_token_mojom.ViewTreeToken viewTreeToken,hit_tests_mojom.HitTesterInterfaceRequest hitTester,void callback(bool rendererChanged));
+  void resolveScenes(List<scene_token_mojom.SceneToken> sceneTokens,void callback(List<view_token_mojom.ViewToken> viewTokens));
 }
 
 abstract class ViewInspectorInterface
     implements bindings.MojoInterface<ViewInspector>,
                ViewInspector {
   factory ViewInspectorInterface([ViewInspector impl]) =>
       new ViewInspectorStub.unbound(impl);
   factory ViewInspectorInterface.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint,
       [ViewInspector impl]) =>
@@ skipping 22 matching lines @@
 
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _viewInspectorMethodGetHitTesterName:
         var r = ViewInspectorGetHitTesterResponseParams.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.rendererChanged );
         break;
       case _viewInspectorMethodResolveScenesName:
         var r = ViewInspectorResolveScenesResponseParams.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.viewTokens );
         break;
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
   ViewInspector get impl => null;
   set impl(ViewInspector _) {
@@ skipping 22 matching lines @@
   ViewInspectorProxy.unbound()
       : super(new _ViewInspectorProxyControl.unbound());
 
   static ViewInspectorProxy newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For ViewInspectorProxy"));
     return new ViewInspectorProxy.fromEndpoint(endpoint);
   }
 
 
-  dynamic getHitTester(view_tree_token_mojom.ViewTreeToken viewTreeToken,hit_tests_mojom.HitTesterInterfaceRequest hitTester,[Function responseFactory = null]) {
+  void getHitTester(view_tree_token_mojom.ViewTreeToken viewTreeToken,hit_tests_mojom.HitTesterInterfaceRequest hitTester,void callback(bool rendererChanged)) {
     var params = new _ViewInspectorGetHitTesterParams();
     params.viewTreeToken = viewTreeToken;
     params.hitTester = hitTester;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _viewInspectorMethodGetHitTesterName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
-  dynamic resolveScenes(List<scene_token_mojom.SceneToken> sceneTokens,[Function responseFactory = null]) {
+  void resolveScenes(List<scene_token_mojom.SceneToken> sceneTokens,void callback(List<view_token_mojom.ViewToken> viewTokens)) {
     var params = new _ViewInspectorResolveScenesParams();
     params.sceneTokens = sceneTokens;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _viewInspectorMethodResolveScenesName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
 }
 
 class _ViewInspectorStubControl
     extends bindings.StubMessageHandler
     implements bindings.StubControl<ViewInspector> {
   ViewInspector _impl;
 
   _ViewInspectorStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [ViewInspector impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _ViewInspectorStubControl.fromHandle(
       core.MojoHandle handle, [ViewInspector impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _ViewInspectorStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => ViewInspector.serviceName;
 
 
-  ViewInspectorGetHitTesterResponseParams _viewInspectorGetHitTesterResponseParamsFactory(bool rendererChanged) {
-    var result = new ViewInspectorGetHitTesterResponseParams();
-    result.rendererChanged = rendererChanged;
-    return result;
+  Function _viewInspectorGetHitTesterResponseParamsResponder(
+      int requestId) {
+  return (bool rendererChanged) {
+      var result = new ViewInspectorGetHitTesterResponseParams();
+      result.rendererChanged = rendererChanged;
+      sendResponse(buildResponseWithId(
+          result,
+          _viewInspectorMethodGetHitTesterName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
-  ViewInspectorResolveScenesResponseParams _viewInspectorResolveScenesResponseParamsFactory(List<view_token_mojom.ViewToken> viewTokens) {
-    var result = new ViewInspectorResolveScenesResponseParams();
-    result.viewTokens = viewTokens;
-    return result;
+  Function _viewInspectorResolveScenesResponseParamsResponder(
+      int requestId) {
+  return (List<view_token_mojom.ViewToken> viewTokens) {
+      var result = new ViewInspectorResolveScenesResponseParams();
+      result.viewTokens = viewTokens;
+      sendResponse(buildResponseWithId(
+          result,
+          _viewInspectorMethodResolveScenesName,
+          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 _viewInspectorMethodGetHitTesterName:
         var params = _ViewInspectorGetHitTesterParams.deserialize(
             message.payload);
-        var response = _impl.getHitTester(params.viewTreeToken,params.hitTester,_viewInspectorGetHitTesterResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _viewInspectorMethodGetHitTesterName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _viewInspectorMethodGetHitTesterName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.getHitTester(params.viewTreeToken, params.hitTester, _viewInspectorGetHitTesterResponseParamsResponder(message.header.requestId));
         break;
       case _viewInspectorMethodResolveScenesName:
         var params = _ViewInspectorResolveScenesParams.deserialize(
             message.payload);
-        var response = _impl.resolveScenes(params.sceneTokens,_viewInspectorResolveScenesResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _viewInspectorMethodResolveScenesName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _viewInspectorMethodResolveScenesName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.resolveScenes(params.sceneTokens, _viewInspectorResolveScenesResponseParamsResponder(message.header.requestId));
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   ViewInspector get impl => _impl;
   set impl(ViewInspector 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, [ViewInspector impl])
       : super(new _ViewInspectorStubControl.fromHandle(handle, impl));
 
   static ViewInspectorStub newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For ViewInspectorStub"));
     return new ViewInspectorStub.fromEndpoint(endpoint);
   }
 
 
-  dynamic getHitTester(view_tree_token_mojom.ViewTreeToken viewTreeToken,hit_tests_mojom.HitTesterInterfaceRequest hitTester,[Function responseFactory = null]) {
-    return impl.getHitTester(viewTreeToken,hitTester,responseFactory);
+  void getHitTester(view_tree_token_mojom.ViewTreeToken viewTreeToken,hit_tests_mojom.HitTesterInterfaceRequest hitTester,void callback(bool rendererChanged)) {
+    return impl.getHitTester(viewTreeToken,hitTester,callback);
   }
-  dynamic resolveScenes(List<scene_token_mojom.SceneToken> sceneTokens,[Function responseFactory = null]) {
-    return impl.resolveScenes(sceneTokens,responseFactory);
+  void resolveScenes(List<scene_token_mojom.SceneToken> sceneTokens,void callback(List<view_token_mojom.ViewToken> viewTokens)) {
+    return impl.resolveScenes(sceneTokens,callback);
   }
 }