Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(332)

Side by Side Diff: sky/framework/embedder.dart

Issue 1053883002: Make embedder.serviceRegistry return a ServiceRegistry instead of ServiceRegistryProxy. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "package:mojo/public/dart/application.dart"; 5 import "package:mojo/public/dart/application.dart";
6 import "dart:sky.internals" as internals; 6 import "dart:sky.internals" as internals;
7 import "package:mojo/public/dart/bindings.dart" as bindings; 7 import "package:mojo/public/dart/bindings.dart" as bindings;
8 import "package:mojo/public/dart/core.dart" as core; 8 import "package:mojo/public/dart/core.dart" as core;
9 import "package:mojo/public/interfaces/application/service_provider.mojom.dart"; 9 import "package:mojo/public/interfaces/application/service_provider.mojom.dart";
10 import "package:mojo/public/interfaces/application/shell.mojom.dart"; 10 import "package:mojo/public/interfaces/application/shell.mojom.dart";
11 import "package:mojo/services/service_registry/public/interfaces/service_registr y.mojom.dart"; 11 import "package:mojo/services/service_registry/public/interfaces/service_registr y.mojom.dart";
12 12
13 final _EmbedderImpl embedder = new _EmbedderImpl(); 13 final _EmbedderImpl embedder = new _EmbedderImpl();
14 14
15 class _EmbedderImpl { 15 class _EmbedderImpl {
16 ApplicationConnection _connection; 16 ApplicationConnection _connection;
17 ServiceRegistry _serviceRegistry; 17 ServiceRegistryProxy _serviceRegistry;
tonyg 2015/04/01 22:42:23 Not quite sure how this worked before. Does `mojob
eseidel 2015/04/01 22:43:24 This line was changed earlier today, iirc?
18 18
19 final ShellProxy shell = new ShellProxy.fromHandle( 19 final ShellProxy shell = new ShellProxy.fromHandle(
20 new core.MojoHandle(internals.takeShellProxyHandle())); 20 new core.MojoHandle(internals.takeShellProxyHandle()));
21 21
22 ApplicationConnection get connection { 22 ApplicationConnection get connection {
23 if (_connection == null) { 23 if (_connection == null) {
24 var stubHandle = 24 var stubHandle =
25 new core.MojoHandle(internals.takeServicesProvidedToEmbedder()); 25 new core.MojoHandle(internals.takeServicesProvidedToEmbedder());
26 var proxyHandle = 26 var proxyHandle =
27 new core.MojoHandle(internals.takeServicesProvidedByEmbedder()); 27 new core.MojoHandle(internals.takeServicesProvidedByEmbedder());
(...skipping 15 matching lines...) Expand all
43 43
44 void connectToService(String url, bindings.ProxyBase proxy) { 44 void connectToService(String url, bindings.ProxyBase proxy) {
45 var appSp = new ServiceProviderProxy.unbound(); 45 var appSp = new ServiceProviderProxy.unbound();
46 shell.ptr.connectToApplication(url, appSp, null); 46 shell.ptr.connectToApplication(url, appSp, null);
47 var pipe = new core.MojoMessagePipe(); 47 var pipe = new core.MojoMessagePipe();
48 proxy.impl.bind(pipe.endpoints[0]); 48 proxy.impl.bind(pipe.endpoints[0]);
49 appSp.ptr.connectToService(proxy.name, pipe.endpoints[1]); 49 appSp.ptr.connectToService(proxy.name, pipe.endpoints[1]);
50 appSp.close(); 50 appSp.close();
51 } 51 }
52 52
53 ServiceRegistryProxy get serviceRegistry { 53 ServiceRegistry get serviceRegistry {
54 if (_serviceRegistry == null) { 54 if (_serviceRegistry == null) {
55 _serviceRegistry = new ServiceRegistryProxy.fromHandle( 55 _serviceRegistry = new ServiceRegistryProxy.fromHandle(
56 new core.MojoHandle(internals.takeServiceRegistry())); 56 new core.MojoHandle(internals.takeServiceRegistry()));
57 } 57 }
58 return _serviceRegistry; 58 return _serviceRegistry.ptr;
59 } 59 }
60 } 60 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698