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

Unified Diff: mojo/public/dart/src/application.dart

Issue 982673002: Dart: Removes need to call listen(). (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Don't pile up callbacks Created 5 years, 10 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/public/dart/src/application.dart
diff --git a/mojo/public/dart/src/application.dart b/mojo/public/dart/src/application.dart
index d0d2afe9d6e3d12a269ed28cb718dcd8098147c5..31659ea0e707e9436a62e2efbef2bb3cd2b43f31 100644
--- a/mojo/public/dart/src/application.dart
+++ b/mojo/public/dart/src/application.dart
@@ -10,23 +10,20 @@ class _ApplicationImpl implements application_mojom.Application {
Application _application;
_ApplicationImpl(Application application,
- core.MojoMessagePipeEndpoint endpoint, {Function onClosed}) {
+ core.MojoMessagePipeEndpoint endpoint) {
_application = application;
- // We wrap the onClosed callback in a closure to ensure that all
- // necessary cleanup is performed on a PEER_CLOSED signal.
- _stub = new application_mojom.ApplicationStub.fromEndpoint(
- endpoint,
- impl: this,
- onClosed: _closer(onClosed));
+ _stub = new application_mojom.ApplicationStub.fromEndpoint(endpoint, this);
+ _stub.onError = close;
}
- _ApplicationImpl.fromHandle(Application application, core.MojoHandle handle,
- {Function onClosed}) {
+ _ApplicationImpl.fromHandle(Application application, core.MojoHandle handle) {
_application = application;
- _stub = new application_mojom.ApplicationStub.fromHandle(
- handle,
- impl: this,
- onClosed: _closer(onClosed));
+ _stub = new application_mojom.ApplicationStub.fromHandle(handle, this);
+ _stub.onError = close;
+ }
+
+ set onError(core.ErrorHandler f) {
+ _stub.onError = f;
}
void initialize(bindings.ProxyBase shellProxy, List<String> args,
@@ -48,17 +45,8 @@ class _ApplicationImpl implements application_mojom.Application {
@override
void requestQuit() => _application._requestQuitAndClose();
- Function _closer(Function onClosed) {
- return (() {
- if (onClosed != null) {
- onClosed();
- }
- close();
- });
- }
-
void close({bool nodefer: false}) {
- shell.close();
+ if (shell != null) shell.close();
_stub.close();
}
}
@@ -72,18 +60,16 @@ abstract class Application {
_ApplicationImpl _applicationImpl;
List<ApplicationConnection> _applicationConnections;
- Application(core.MojoMessagePipeEndpoint endpoint, {Function onClosed}) {
+ Application(core.MojoMessagePipeEndpoint endpoint) {
_applicationConnections = [];
- // We wrap the onClosed callback in a closure to ensure that all
- // necessary cleanup is performed on a PEER_CLOSED signal.
- _applicationImpl =
- new _ApplicationImpl(this, endpoint, onClosed: _closer(onClosed));
+ _applicationImpl = new _ApplicationImpl(this, endpoint);
+ _applicationImpl.onError = close;
}
- Application.fromHandle(core.MojoHandle appHandle, {Function onClosed}) {
+ Application.fromHandle(core.MojoHandle appHandle) {
_applicationConnections = [];
- _applicationImpl =
- new _ApplicationImpl.fromHandle(this, appHandle, onClosed: _closer(onClosed));
+ _applicationImpl = new _ApplicationImpl.fromHandle(this, appHandle);
+ _applicationImpl.onError = close;
}
void initialize(List<String> args, String url) {}
@@ -115,15 +101,6 @@ abstract class Application {
close();
}
- Function _closer(Function onClose) {
- return (() {
- if (onClose != null) {
- onClose();
- }
- close();
- });
- }
-
void close() {
assert(_applicationImpl != null);
_applicationConnections.forEach((c) => c.close());
@@ -132,7 +109,7 @@ abstract class Application {
}
// This method closes all the application connections. Used during apptesting.
- resetConnections() {
+ void resetConnections() {
assert(_applicationImpl != null);
_applicationConnections.forEach((c) => c.close());
_applicationConnections.clear();
@@ -146,8 +123,6 @@ abstract class Application {
}
// Override this method to provide services on |connection|.
- // If you provide at least one service or set fallbackServiceProvider,
- // then you must invoke connection.listen().
void acceptConnection(String requestorUrl, String resolvedUrl,
ApplicationConnection connection) {
}

Powered by Google App Engine
This is Rietveld 408576698