Index: mojo/dart/packages/mojo_services/lib/mojo/clipboard.mojom.dart |
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/clipboard.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/clipboard.mojom.dart |
index 9e75d497153f82c2c2544f7b28f044a2c86035ef..0f54d5a7a3160864ba7ea535578cc1a0721eabdb 100644 |
--- a/mojo/dart/packages/mojo_services/lib/mojo/clipboard.mojom.dart |
+++ b/mojo/dart/packages/mojo_services/lib/mojo/clipboard.mojom.dart |
@@ -702,6 +702,26 @@ class _ClipboardServiceDescription implements service_describer.ServiceDescripti |
abstract class Clipboard { |
static const String serviceName = "mojo::Clipboard"; |
+ |
+ static service_describer.ServiceDescription _cachedServiceDescription; |
+ static service_describer.ServiceDescription get serviceDescription { |
+ if (_cachedServiceDescription == null) { |
+ _cachedServiceDescription = new _ClipboardServiceDescription(); |
+ } |
+ return _cachedServiceDescription; |
+ } |
+ |
+ static ClipboardProxy connectToService( |
+ bindings.ServiceConnector s, String url, [String serviceName]) { |
+ ClipboardProxy p = new ClipboardProxy.unbound(); |
+ String name = serviceName ?? Clipboard.serviceName; |
+ if ((name == null) || name.isEmpty) { |
+ throw new core.MojoApiError( |
+ "If an interface has no ServiceName, then one must be provided."); |
+ } |
+ s.connectToService(url, p, name); |
+ return p; |
+ } |
dynamic getSequenceNumber(ClipboardType clipboardType,[Function responseFactory = null]); |
dynamic getAvailableMimeTypes(ClipboardType clipboardTypes,[Function responseFactory = null]); |
dynamic readMimeType(ClipboardType clipboardType,String mimeType,[Function responseFactory = null]); |
@@ -711,9 +731,27 @@ abstract class Clipboard { |
static const String mimeTypeUrl = "text/url"; |
} |
+abstract class ClipboardInterface |
+ implements bindings.MojoInterface<Clipboard>, |
+ Clipboard { |
+ factory ClipboardInterface([Clipboard impl]) => |
+ new ClipboardStub.unbound(impl); |
+ factory ClipboardInterface.fromEndpoint( |
+ core.MojoMessagePipeEndpoint endpoint, |
+ [Clipboard impl]) => |
+ new ClipboardStub.fromEndpoint(endpoint, impl); |
+} |
+ |
+abstract class ClipboardInterfaceRequest |
+ implements bindings.MojoInterface<Clipboard>, |
+ Clipboard { |
+ factory ClipboardInterfaceRequest() => |
+ new ClipboardProxy.unbound(); |
+} |
+ |
class _ClipboardProxyControl |
extends bindings.ProxyMessageHandler |
- implements bindings.ProxyControl { |
+ implements bindings.ProxyControl<Clipboard> { |
_ClipboardProxyControl.fromEndpoint( |
core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint); |
@@ -722,9 +760,6 @@ class _ClipboardProxyControl |
_ClipboardProxyControl.unbound() : super.unbound(); |
- service_describer.ServiceDescription get serviceDescription => |
- new _ClipboardServiceDescription(); |
- |
String get serviceName => Clipboard.serviceName; |
void handleResponse(bindings.ServiceMessage message) { |
@@ -796,6 +831,11 @@ class _ClipboardProxyControl |
} |
} |
+ Clipboard get impl => null; |
+ set impl(Clipboard _) { |
+ throw new core.MojoApiError("The impl of a Proxy cannot be set."); |
+ } |
+ |
@override |
String toString() { |
var superString = super.toString(); |
@@ -804,8 +844,10 @@ class _ClipboardProxyControl |
} |
class ClipboardProxy |
- extends bindings.Proxy |
- implements Clipboard { |
+ extends bindings.Proxy<Clipboard> |
+ implements Clipboard, |
+ ClipboardInterface, |
+ ClipboardInterfaceRequest { |
ClipboardProxy.fromEndpoint( |
core.MojoMessagePipeEndpoint endpoint) |
: super(new _ClipboardProxyControl.fromEndpoint(endpoint)); |
@@ -822,13 +864,6 @@ class ClipboardProxy |
return new ClipboardProxy.fromEndpoint(endpoint); |
} |
- factory ClipboardProxy.connectToService( |
- bindings.ServiceConnector s, String url, [String serviceName]) { |
- ClipboardProxy p = new ClipboardProxy.unbound(); |
- s.connectToService(url, p, serviceName); |
- return p; |
- } |
- |
dynamic getSequenceNumber(ClipboardType clipboardType,[Function responseFactory = null]) { |
var params = new _ClipboardGetSequenceNumberParams(); |
@@ -890,6 +925,8 @@ class _ClipboardStubControl |
_ClipboardStubControl.unbound([this._impl]) : super.unbound(); |
+ String get serviceName => Clipboard.serviceName; |
+ |
ClipboardGetSequenceNumberResponseParams _clipboardGetSequenceNumberResponseParamsFactory(int sequence) { |
var result = new ClipboardGetSequenceNumberResponseParams(); |
@@ -1021,19 +1058,16 @@ class _ClipboardStubControl |
} |
int get version => 0; |
- |
- static service_describer.ServiceDescription _cachedServiceDescription; |
- static service_describer.ServiceDescription get serviceDescription { |
- if (_cachedServiceDescription == null) { |
- _cachedServiceDescription = new _ClipboardServiceDescription(); |
- } |
- return _cachedServiceDescription; |
- } |
} |
class ClipboardStub |
extends bindings.Stub<Clipboard> |
- implements Clipboard { |
+ implements Clipboard, |
+ ClipboardInterface, |
+ ClipboardInterfaceRequest { |
+ ClipboardStub.unbound([Clipboard impl]) |
+ : super(new _ClipboardStubControl.unbound(impl)); |
+ |
ClipboardStub.fromEndpoint( |
core.MojoMessagePipeEndpoint endpoint, [Clipboard impl]) |
: super(new _ClipboardStubControl.fromEndpoint(endpoint, impl)); |
@@ -1042,18 +1076,12 @@ class ClipboardStub |
core.MojoHandle handle, [Clipboard impl]) |
: super(new _ClipboardStubControl.fromHandle(handle, impl)); |
- ClipboardStub.unbound([Clipboard impl]) |
- : super(new _ClipboardStubControl.unbound(impl)); |
- |
static ClipboardStub newFromEndpoint( |
core.MojoMessagePipeEndpoint endpoint) { |
assert(endpoint.setDescription("For ClipboardStub")); |
return new ClipboardStub.fromEndpoint(endpoint); |
} |
- static service_describer.ServiceDescription get serviceDescription => |
- _ClipboardStubControl.serviceDescription; |
- |
dynamic getSequenceNumber(ClipboardType clipboardType,[Function responseFactory = null]) { |
return impl.getSequenceNumber(clipboardType,responseFactory); |