Index: sky/framework/shell.dart |
diff --git a/sky/framework/shell.dart b/sky/framework/shell.dart |
index 86a71a4c229cb75918edbbb6a10afd24f9b9390e..4e99457a5ed3630cc97536cf236041a3a3346d6a 100644 |
--- a/sky/framework/shell.dart |
+++ b/sky/framework/shell.dart |
@@ -3,21 +3,23 @@ |
// found in the LICENSE file. |
import "dart:sky.internals" as internals; |
+import "embedder.dart"; |
import "package:mojo/public/dart/application.dart"; |
import "package:mojo/public/interfaces/application/service_provider.mojom.dart"; |
-import 'package:mojo/public/dart/core.dart' as core; |
+import "package:mojo/public/dart/core.dart" as core; |
ApplicationConnection _initConnection() { |
int rawHandle = internals.takeServicesProvidedByEmbedder(); |
core.MojoHandle proxyHandle = new core.MojoHandle(rawHandle); |
ServiceProviderProxy serviceProvider = null; |
- if (proxyHandle.isValid) |
- serviceProvider = new ServiceProviderProxy.fromHandle(proxyHandle); |
+ if (proxyHandle.isValid) serviceProvider = |
eseidel
2015/04/15 23:09:04
Really? This is dart style?
|
+ new ServiceProviderProxy.fromHandle(proxyHandle); |
return new ApplicationConnection(null, serviceProvider); |
} |
final ApplicationConnection _connection = _initConnection(); |
-void requestService(Object proxy) { |
- _connection.requestService(proxy); |
+void requestService(String url, Object proxy) { |
+ if (embedder.shell == null) _connection.requestService(proxy); |
eseidel
2015/04/15 23:09:04
Why are one-line ifs a good thing? :p
hansmuller1
2015/04/15 23:13:34
According to the Dart Style Guide, if statements s
|
+ else embedder.connectToService(url, proxy); |
} |