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

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

Issue 996923003: Dart: Better handle leak checks. close() is async. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Merge Created 5 years, 9 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
« no previous file with comments | « mojo/dart/test/validation_test.dart ('k') | mojo/public/dart/src/application_connection.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/dart/src/application.dart
diff --git a/mojo/public/dart/src/application.dart b/mojo/public/dart/src/application.dart
index 4d6ba3bb58bf26a2608c45fa1423262ac7c0fb6a..03d0843f4e55e1d7947ce27064746eea71eb7f75 100644
--- a/mojo/public/dart/src/application.dart
+++ b/mojo/public/dart/src/application.dart
@@ -41,9 +41,9 @@ class _ApplicationImpl implements application_mojom.Application {
@override
void requestQuit() => _application._requestQuitAndClose();
- void close({bool nodefer: false}) {
+ Future close({bool nodefer: false}) {
if (shell != null) shell.close();
- _stub.close();
+ return _stub.close();
}
}
@@ -55,17 +55,18 @@ class _ApplicationImpl implements application_mojom.Application {
abstract class Application {
_ApplicationImpl _applicationImpl;
List<ApplicationConnection> _applicationConnections;
+ Function onError;
Application(core.MojoMessagePipeEndpoint endpoint) {
_applicationConnections = [];
_applicationImpl = new _ApplicationImpl(this, endpoint);
- _applicationImpl.onError = close;
+ _applicationImpl.onError = _errorHandler;
}
Application.fromHandle(core.MojoHandle appHandle) {
_applicationConnections = [];
_applicationImpl = new _ApplicationImpl.fromHandle(this, appHandle);
- _applicationImpl.onError = close;
+ _applicationImpl.onError = _errorHandler;
}
void initialize(List<String> args, String url) {}
@@ -97,11 +98,17 @@ abstract class Application {
close();
}
- void close() {
+ void _errorHandler() {
+ close().then((_) {
+ if (onError != null) onError();
+ });
+ }
+
+ Future close() {
assert(_applicationImpl != null);
_applicationConnections.forEach((c) => c.close());
_applicationConnections.clear();
- _applicationImpl.close();
+ return _applicationImpl.close();
}
// This method closes all the application connections. Used during apptesting.
« no previous file with comments | « mojo/dart/test/validation_test.dart ('k') | mojo/public/dart/src/application_connection.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698