Dart: Adds optional named arguments for creating bindings.

mojo/public/dart/src/application.dart

Index: mojo/public/dart/src/application.dart
diff --git a/mojo/public/dart/src/application.dart b/mojo/public/dart/src/application.dart
index 3ae900b5ce884a95669d031425ee1b1cc07ccf07..07af109fd21227332f44b2f94834b487e1795811 100644
--- a/mojo/public/dart/src/application.dart
+++ b/mojo/public/dart/src/application.dart
@@ -10,34 +10,51 @@ class _ApplicationImpl implements application_mojom.Application {
   Application _application;
 
   _ApplicationImpl(Application application,
-      core.MojoMessagePipeEndpoint endpoint) {
+                   core.MojoMessagePipeEndpoint endpoint,
+                   {Function onClosed}) {
     _application = application;
-    _stub = new application_mojom.ApplicationStub.fromEndpoint(endpoint)
-        ..delegate = this
-        ..listen();
+    // We wrap the onClosed callback in a closure to ensure that all
+    // necessary cleanup is performed on a PEER_CLOSED signal.
+    _stub = new application_mojom.ApplicationStub.fromEndpoint(
+        endpoint, impl: this, onClosed: _closer(onClosed));
   }
 
-  _ApplicationImpl.fromHandle(Application application, core.MojoHandle handle) {
+  _ApplicationImpl.fromHandle(Application application, core.MojoHandle handle,
+                              {Function onClosed}) {
     _application = application;
-    _stub = new application_mojom.ApplicationStub.fromHandle(handle)
-        ..delegate = this
-        ..listen();
+    _stub = new application_mojom.ApplicationStub.fromHandle(
+        handle, impl: this, onClosed: _closer(onClosed));
   }
 
-  void initialize(bindings.ProxyBase shellProxy, List<String> args,
-      String url) {
+  void initialize(
+      bindings.ProxyBase shellProxy, List<String> args, String url) {
     assert(shell == null);
     shell = shellProxy;
     _application.initialize(args, url);
   }
 
-  void acceptConnection(String requestorUrl, ServiceProviderStub services,
-      bindings.ProxyBase exposedServices, String requested_url) =>
-      _application._acceptConnection(requestorUrl, services, exposedServices);
+  void acceptConnection(String requestorUrl,
+                        ServiceProviderStub services,
+                        bindings.ProxyBase exposedServices,
+                        String resolvedUrl) =>
+    _application._acceptConnection(
+        requestorUrl, services,  exposedServices, resolvedUrl);
 
   void requestQuit() => _application._requestQuitAndClose();
 
-  void close({bool nodefer: false}) => shell.close();
+  Function _closer(Function onClosed) {
+    return (() {
+      if(onClosed != null) {

[sky, 2015/03/03 20:14:13]

nit: space after if?

[zra, 2015/03/03 21:28:54]

Done.

+        onClosed();
+      }
+      close();
+    });
+  }
+
+  void close({bool nodefer: false}) {
+    shell.close();
+    _stub.close();
+  }
 }
 
 // TODO(zra): Better documentation and examples.
@@ -49,14 +66,18 @@ abstract class Application {
   _ApplicationImpl _applicationImpl;
   List<ApplicationConnection> _applicationConnections;
 
-  Application(core.MojoMessagePipeEndpoint endpoint) {
+  Application(core.MojoMessagePipeEndpoint endpoint, {Function onClosed}) {
     _applicationConnections = [];
-    _applicationImpl = new _ApplicationImpl(this, endpoint);
+    // We wrap the onClosed callback in a closure to ensure that all
+    // necessary cleanup is performed on a PEER_CLOSED signal.
+    _applicationImpl = new _ApplicationImpl(
+        this, endpoint, onClosed: _closer(onClosed));
   }
 
-  Application.fromHandle(core.MojoHandle appHandle) {
+  Application.fromHandle(core.MojoHandle appHandle, {Function onClosed}) {
     _applicationConnections = [];
-    _applicationImpl = new _ApplicationImpl.fromHandle(this, appHandle);
+    _applicationImpl = new _ApplicationImpl.fromHandle(
+        this, appHandle, onClosed: _closer(onClosed));
   }
 
   void initialize(List<String> args, String url) {}
@@ -65,7 +86,7 @@ abstract class Application {
   // mojo services. Do not use for any other purpose.
   void initializeFromShellProxy(shell_mojom.ShellProxy shellProxy,
       List<String> args, String url) =>
-      _applicationImpl.initialize(shellProxy, args, url);
+    _applicationImpl.initialize(shellProxy, args, url);
 
   // Returns a connection to the app at |url|.
   ApplicationConnection connectToApplication(String url) {
@@ -88,23 +109,39 @@ abstract class Application {
     close();
   }
 
+  Function _closer(Function onClose) {
+    return (() {
+      if (onClose != null) {
+        onClose();
+      }
+      close();
+    });
+  }
+
   void close() {
-    assert(_applicationImpl != null);
     _applicationConnections.forEach((c) => c.close());
     _applicationConnections.clear();
-    _applicationImpl.close();
+    if (_applicationImpl != null) {
+      _applicationImpl.close();
+      _applicationImpl = null;
+    }
   }
 
-  void _acceptConnection(String requestorUrl, ServiceProviderStub services,
-      ServiceProviderProxy exposedServices) {
+  void _acceptConnection(
+      String requestorUrl,
+      ServiceProviderStub services,
+      ServiceProviderProxy exposedServices,
+      String resolvedUrl) {
     var connection = new ApplicationConnection(services, exposedServices);
     _applicationConnections.add(connection);
-    acceptConnection(requestorUrl, connection);
+    acceptConnection(requestorUrl, connection, resolvedUrl);
   }
 
   // Override this method to provide services on |connection|.
   // If you provide at least one service or set fallbackServiceProvider,
   // then you must invoke connection.listen().

[hansmuller1, 2015/03/03 20:32:16]

Is it still necessary to call connection.listen() here? 

[zra, 2015/03/03 21:28:54]

Yes at the moment. listen() can't be called until after all the factories are
set up.

-  void acceptConnection(String requestorUrl, ApplicationConnection connection) {
+  void acceptConnection(String requestorUrl,
+                        ApplicationConnection connection,
+                        String resolvedUrl) {
   }
 }