| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 import "dart:sky.internals" as internals; | 5 import "dart:sky.internals" as internals; |
| 6 import "embedder.dart"; |
| 6 import "package:mojo/public/dart/application.dart"; | 7 import "package:mojo/public/dart/application.dart"; |
| 7 import 'package:mojo/public/dart/core.dart' as core; | 8 import 'package:mojo/public/dart/core.dart' as core; |
| 8 import "package:mojo/service_provider.mojom.dart"; | 9 import "package:mojo/service_provider.mojom.dart"; |
| 9 | 10 |
| 10 ApplicationConnection _initConnection() { | 11 ApplicationConnection _initConnection() { |
| 11 int rawHandle = internals.takeServicesProvidedByEmbedder(); | 12 int rawHandle = internals.takeServicesProvidedByEmbedder(); |
| 12 core.MojoHandle proxyHandle = new core.MojoHandle(rawHandle); | 13 core.MojoHandle proxyHandle = new core.MojoHandle(rawHandle); |
| 13 ServiceProviderProxy serviceProvider = null; | 14 ServiceProviderProxy serviceProvider = null; |
| 14 if (proxyHandle.isValid) | 15 if (proxyHandle.isValid) serviceProvider = |
| 15 serviceProvider = new ServiceProviderProxy.fromHandle(proxyHandle); | 16 new ServiceProviderProxy.fromHandle(proxyHandle); |
| 16 return new ApplicationConnection(null, serviceProvider); | 17 return new ApplicationConnection(null, serviceProvider); |
| 17 } | 18 } |
| 18 | 19 |
| 19 final ApplicationConnection _connection = _initConnection(); | 20 final ApplicationConnection _connection = _initConnection(); |
| 20 | 21 |
| 21 void requestService(Object proxy) { | 22 void requestService(String url, Object proxy) { |
| 22 _connection.requestService(proxy); | 23 if (embedder.shell == null) _connection.requestService(proxy); |
| 24 else embedder.connectToService(url, proxy); |
| 23 } | 25 } |
| OLD | NEW |