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

Unified Diff: mojo/services/network/tcp_server_socket_impl.cc

Issue 1139673003: Make Mandoline shut down cleanly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 7 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/services/network/tcp_server_socket_impl.h ('k') | mojo/services/network/udp_socket_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/network/tcp_server_socket_impl.cc
diff --git a/mojo/services/network/tcp_server_socket_impl.cc b/mojo/services/network/tcp_server_socket_impl.cc
index 96ec1e3ebd7dbe65dd43e4e6de796db899f1e2e9..dce7ecb744c9310fd9329ab4fb0ea36e29de8a1a 100644
--- a/mojo/services/network/tcp_server_socket_impl.cc
+++ b/mojo/services/network/tcp_server_socket_impl.cc
@@ -11,8 +11,10 @@
namespace mojo {
-TCPServerSocketImpl::TCPServerSocketImpl(scoped_ptr<net::TCPSocket> socket)
- : socket_(socket.Pass()) {
+TCPServerSocketImpl::TCPServerSocketImpl(
+ scoped_ptr<net::TCPSocket> socket,
+ scoped_ptr<mojo::AppRefCount> app_refcount)
+ : socket_(socket.Pass()), app_refcount_(app_refcount.Pass()) {
}
TCPServerSocketImpl::~TCPServerSocketImpl() {
@@ -57,7 +59,8 @@ void TCPServerSocketImpl::OnAcceptCompleted(int result) {
} else {
new TCPConnectedSocketImpl(
accepted_socket_.Pass(), pending_send_stream_.Pass(),
- pending_receive_stream_.Pass(), pending_client_socket_.Pass());
+ pending_receive_stream_.Pass(), pending_client_socket_.Pass(),
+ app_refcount_->Clone());
pending_callback_.Run(MakeNetworkError(net::OK),
NetAddress::From(accepted_address_));
}
« no previous file with comments | « mojo/services/network/tcp_server_socket_impl.h ('k') | mojo/services/network/udp_socket_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698