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

Unified Diff: third_party/mojo/src/mojo/public/cpp/bindings/binding.h

Issue 1019173002: Update mojo sdk to rev 7214b7ec7d27563b2666afad86cf1c5895c56c18 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Keep permission service alive if embedder drops requests 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
Index: third_party/mojo/src/mojo/public/cpp/bindings/binding.h
diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/binding.h b/third_party/mojo/src/mojo/public/cpp/bindings/binding.h
index db5e96d911336308ea05676cae5a93dec6da8f4e..a982bdbd4b10642837f8e1306253f0832f43e95b 100644
--- a/third_party/mojo/src/mojo/public/cpp/bindings/binding.h
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/binding.h
@@ -101,7 +101,7 @@ class Binding : public ErrorHandler {
// implementation unbound.
~Binding() override {
if (internal_router_) {
- DestroyRouter();
+ Close();
}
}
@@ -169,6 +169,8 @@ class Binding : public ErrorHandler {
InterfaceRequest<Interface> request =
MakeRequest<Interface>(internal_router_->PassMessagePipe());
DestroyRouter();
+ // TODO(vtl): The |.Pass()| below is only needed due to an MSVS bug; remove
+ // it once that's fixed.
return request.Pass();
}

Powered by Google App Engine
This is Rietveld 408576698