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

Unified Diff: mojo/dart/packages/mojo/lib/mojo/application.mojom.dart

Issue 2034383003: Removed exposed_services from mojom definitions. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: mojo/dart/packages/mojo/lib/mojo/application.mojom.dart
diff --git a/mojo/dart/packages/mojo/lib/mojo/application.mojom.dart b/mojo/dart/packages/mojo/lib/mojo/application.mojom.dart
index 39f1183e20bdc3047cbb477b51df80ed069f09a9..0594aab9d03d0f593e027b9dfaa268bfcf79c66d 100644
--- a/mojo/dart/packages/mojo/lib/mojo/application.mojom.dart
+++ b/mojo/dart/packages/mojo/lib/mojo/application.mojom.dart
@@ -128,12 +128,11 @@ class _ApplicationInitializeParams extends bindings.Struct {
class _ApplicationAcceptConnectionParams extends bindings.Struct {
static const List<bindings.StructDataHeader> kVersions = const [
- const bindings.StructDataHeader(40, 0)
+ const bindings.StructDataHeader(32, 0)
];
String requestorUrl = null;
- service_provider_mojom.ServiceProviderInterfaceRequest services = null;
- service_provider_mojom.ServiceProviderInterface exposedServices = null;
String resolvedUrl = null;
+ service_provider_mojom.ServiceProviderInterfaceRequest services = null;
_ApplicationAcceptConnectionParams() : super(kVersions.last.size);
@@ -176,15 +175,11 @@ class _ApplicationAcceptConnectionParams extends bindings.Struct {
}
if (mainDataHeader.version >= 0) {
- result.services = decoder0.decodeInterfaceRequest(16, true, service_provider_mojom.ServiceProviderStub.newFromEndpoint);
+ result.resolvedUrl = decoder0.decodeString(16, false);
}
if (mainDataHeader.version >= 0) {
- result.exposedServices = decoder0.decodeServiceInterface(20, true, service_provider_mojom.ServiceProviderProxy.newFromEndpoint);
- }
- if (mainDataHeader.version >= 0) {
-
- result.resolvedUrl = decoder0.decodeString(32, false);
+ result.services = decoder0.decodeInterfaceRequest(24, false, service_provider_mojom.ServiceProviderStub.newFromEndpoint);
}
return result;
}
@@ -199,24 +194,17 @@ class _ApplicationAcceptConnectionParams extends bindings.Struct {
rethrow;
}
try {
- encoder0.encodeInterfaceRequest(services, 16, true);
+ encoder0.encodeString(resolvedUrl, 16, false);
} on bindings.MojoCodecError catch(e) {
e.message = "Error encountered while encoding field "
- "services of struct _ApplicationAcceptConnectionParams: $e";
- rethrow;
- }
- try {
- encoder0.encodeInterface(exposedServices, 20, true);
- } on bindings.MojoCodecError catch(e) {
- e.message = "Error encountered while encoding field "
- "exposedServices of struct _ApplicationAcceptConnectionParams: $e";
+ "resolvedUrl of struct _ApplicationAcceptConnectionParams: $e";
rethrow;
}
try {
- encoder0.encodeString(resolvedUrl, 32, false);
+ encoder0.encodeInterfaceRequest(services, 24, false);
} on bindings.MojoCodecError catch(e) {
e.message = "Error encountered while encoding field "
- "resolvedUrl of struct _ApplicationAcceptConnectionParams: $e";
+ "services of struct _ApplicationAcceptConnectionParams: $e";
rethrow;
}
}
@@ -224,9 +212,8 @@ class _ApplicationAcceptConnectionParams extends bindings.Struct {
String toString() {
return "_ApplicationAcceptConnectionParams("
"requestorUrl: $requestorUrl" ", "
- "services: $services" ", "
- "exposedServices: $exposedServices" ", "
- "resolvedUrl: $resolvedUrl" ")";
+ "resolvedUrl: $resolvedUrl" ", "
+ "services: $services" ")";
}
Map toJson() {
@@ -331,7 +318,7 @@ abstract class Application {
return p;
}
void initialize(shell_mojom.ShellInterface shell, List<String> args, String url);
- void acceptConnection(String requestorUrl, service_provider_mojom.ServiceProviderInterfaceRequest services, service_provider_mojom.ServiceProviderInterface exposedServices, String resolvedUrl);
+ void acceptConnection(String requestorUrl, String resolvedUrl, service_provider_mojom.ServiceProviderInterfaceRequest services);
void requestQuit();
}
@@ -434,9 +421,9 @@ class ApplicationProxy
ctrl.sendMessage(params,
_applicationMethodInitializeName);
}
- void acceptConnection(String requestorUrl, service_provider_mojom.ServiceProviderInterfaceRequest services, service_provider_mojom.ServiceProviderInterface exposedServices, String resolvedUrl) {
+ void acceptConnection(String requestorUrl, String resolvedUrl, service_provider_mojom.ServiceProviderInterfaceRequest services) {
if (impl != null) {
- impl.acceptConnection(requestorUrl, services, exposedServices, resolvedUrl);
+ impl.acceptConnection(requestorUrl, resolvedUrl, services);
return;
}
if (!ctrl.isBound) {
@@ -445,9 +432,8 @@ class ApplicationProxy
}
var params = new _ApplicationAcceptConnectionParams();
params.requestorUrl = requestorUrl;
- params.services = services;
- params.exposedServices = exposedServices;
params.resolvedUrl = resolvedUrl;
+ params.services = services;
ctrl.sendMessage(params,
_applicationMethodAcceptConnectionName);
}
@@ -507,7 +493,7 @@ class _ApplicationStubControl
case _applicationMethodAcceptConnectionName:
var params = _ApplicationAcceptConnectionParams.deserialize(
message.payload);
- _impl.acceptConnection(params.requestorUrl, params.services, params.exposedServices, params.resolvedUrl);
+ _impl.acceptConnection(params.requestorUrl, params.resolvedUrl, params.services);
break;
case _applicationMethodRequestQuitName:
_impl.requestQuit();
@@ -573,8 +559,8 @@ class ApplicationStub
void initialize(shell_mojom.ShellInterface shell, List<String> args, String url) {
return impl.initialize(shell, args, url);
}
- void acceptConnection(String requestorUrl, service_provider_mojom.ServiceProviderInterfaceRequest services, service_provider_mojom.ServiceProviderInterface exposedServices, String resolvedUrl) {
- return impl.acceptConnection(requestorUrl, services, exposedServices, resolvedUrl);
+ void acceptConnection(String requestorUrl, String resolvedUrl, service_provider_mojom.ServiceProviderInterfaceRequest services) {
+ return impl.acceptConnection(requestorUrl, resolvedUrl, services);
}
void requestQuit() {
return impl.requestQuit();
« no previous file with comments | « examples/moterm_example_app/moterm_example_app.cc ('k') | mojo/dart/packages/mojo/lib/mojo/application_connector.mojom.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698