Dart: Futures -> Callbacks.

mojo/dart/packages/mojo/lib/mojo/shell.mojom.dart

Index: mojo/dart/packages/mojo/lib/mojo/shell.mojom.dart
diff --git a/mojo/dart/packages/mojo/lib/mojo/shell.mojom.dart b/mojo/dart/packages/mojo/lib/mojo/shell.mojom.dart
index d454deb45e53c72606030693139e1aea757392cc..c12dbb09df97aa1e4b7553bc8668f489b1561f73 100644
--- a/mojo/dart/packages/mojo/lib/mojo/shell.mojom.dart
+++ b/mojo/dart/packages/mojo/lib/mojo/shell.mojom.dart
@@ -20,6 +20,11 @@ class _ShellConnectToApplicationParams extends bindings.Struct {
 
   _ShellConnectToApplicationParams() : super(kVersions.last.size);
 
+  _ShellConnectToApplicationParams.init(
+    String this.applicationUrl, 
+    service_provider_mojom.ServiceProviderInterfaceRequest this.services
+  ) : super(kVersions.last.size);
+
   static _ShellConnectToApplicationParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -103,6 +108,10 @@ class _ShellCreateApplicationConnectorParams extends bindings.Struct {
 
   _ShellCreateApplicationConnectorParams() : super(kVersions.last.size);
 
+  _ShellCreateApplicationConnectorParams.init(
+    application_connector_mojom.ApplicationConnectorInterfaceRequest this.applicationConnectorRequest
+  ) : super(kVersions.last.size);
+
   static _ShellCreateApplicationConnectorParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -169,14 +178,17 @@ const int _shellMethodConnectToApplicationName = 0;
 const int _shellMethodCreateApplicationConnectorName = 1;
 
 class _ShellServiceDescription 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 Shell {
@@ -342,11 +354,11 @@ class _ShellStubControl
 
 
 
-  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");
@@ -366,7 +378,6 @@ class _ShellStubControl
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   Shell get impl => _impl;