Simple multi-url support for mojo apps

mojo/public/dart/src/application.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.
 
 part of application;
 
 class _ApplicationImpl implements application_mojom.Application {
   application_mojom.ApplicationStub _stub;
   shell_mojom.ShellProxy shell;
   Application _application;
 
   _ApplicationImpl(Application application,
-                   core.MojoMessagePipeEndpoint endpoint) {
+      core.MojoMessagePipeEndpoint endpoint) {
     _application = application;
     _stub = new application_mojom.ApplicationStub.fromEndpoint(endpoint)
-            ..delegate = this
-            ..listen();
+        ..delegate = this
+        ..listen();
   }
 
   _ApplicationImpl.fromHandle(Application application, core.MojoHandle handle) {
     _application = application;
     _stub = new application_mojom.ApplicationStub.fromHandle(handle)
-            ..delegate = this
-            ..listen();
+        ..delegate = this
+        ..listen();
   }
 
-  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) =>
-    _application._acceptConnection(requestorUrl, services,  exposedServices);
+  void acceptConnection(String requestorUrl, ServiceProviderStub services,
+      bindings.ProxyBase exposedServices, String requested_url) =>
+      _application._acceptConnection(requestorUrl, services, exposedServices);
 
   void requestQuit() => _application._requestQuitAndClose();
 
   void close({bool nodefer: false}) => shell.close();
 }
 
 // TODO(zra): Better documentation and examples.
 // To implement, do the following:
 // - Optionally override initialize() to process command-line args.
 // - Optionally override acceptConnection() if services are to be provided.
@@ skipping 11 matching lines @@
     _applicationConnections = [];
     _applicationImpl = new _ApplicationImpl.fromHandle(this, appHandle);
   }
 
   void initialize(List<String> args, String url) {}
 
   // TODO(skydart): This is a temporary fix to allow sky application to consume
   // 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) {
     var proxy = new ServiceProviderProxy.unbound();
     var stub = new ServiceProviderStub.unbound();
     _applicationImpl.shell.ptr.connectToApplication(url, proxy, stub);
     var connection = new ApplicationConnection(stub, proxy);
     _applicationConnections.add(connection);
     return connection;
   }
 
   void connectToService(String url, bindings.ProxyBase proxy) {
     connectToApplication(url).requestService(proxy);
   }
 
   void requestQuit() {}
 
   void _requestQuitAndClose() {
     requestQuit();
     close();
   }
 
   void close() {
     assert(_applicationImpl != null);
     _applicationConnections.forEach((c) => c.close());
     _applicationConnections.clear();
     _applicationImpl.close();
   }
 
-  void _acceptConnection(
-      String requestorUrl,
-      ServiceProviderStub services,
+  void _acceptConnection(String requestorUrl, ServiceProviderStub services,
       ServiceProviderProxy exposedServices) {
     var connection = new ApplicationConnection(services, exposedServices);
     _applicationConnections.add(connection);
     acceptConnection(requestorUrl, connection);
   }
 
   // Override this method to provide services on |connection|.
   // If you provide at least one service or set fallbackServiceProvider,
   // then you must invoke connection.listen().
   void acceptConnection(String requestorUrl, ApplicationConnection connection) {
   }
 }