diff options
author | ben <ben@chromium.org> | 2016-02-25 23:30:25 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-02-26 07:31:39 +0000 |
commit | e4a2bc4fb161d8d2ea673d5f55119d36be2cf06f (patch) | |
tree | a09be63e6724713539bd7065ecdcb38b0233a73e /mojo/services/network/http_server_impl.h | |
parent | 0d78506780d9bf1e5e80a0bfca6099a80fd355e0 (diff) | |
download | chromium_src-e4a2bc4fb161d8d2ea673d5f55119d36be2cf06f.zip chromium_src-e4a2bc4fb161d8d2ea673d5f55119d36be2cf06f.tar.gz chromium_src-e4a2bc4fb161d8d2ea673d5f55119d36be2cf06f.tar.bz2 |
Replace with mojo::Connector (already exists) now that Shell is gone.
Requires:
- Move AppRefCount to a different class, MessageLoopRef, which is optionally used by applications that wish to quit the current message loop started by application runner when the ref drops to zero.
- Changing the signature of Initialize() to take a Connector. This is what most of the change in this CL is.
BUG=
Review URL: https://codereview.chromium.org/1725353003
Cr-Commit-Position: refs/heads/master@{#377841}
Diffstat (limited to 'mojo/services/network/http_server_impl.h')
-rw-r--r-- | mojo/services/network/http_server_impl.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mojo/services/network/http_server_impl.h b/mojo/services/network/http_server_impl.h index a631146..f79b7a8 100644 --- a/mojo/services/network/http_server_impl.h +++ b/mojo/services/network/http_server_impl.h @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "mojo/services/network/public/interfaces/http_server.mojom.h" #include "mojo/services/network/public/interfaces/net_address.mojom.h" -#include "mojo/shell/public/cpp/shell.h" +#include "mojo/shell/public/cpp/message_loop_ref.h" #include "net/server/http_server.h" namespace net { @@ -28,7 +28,7 @@ class HttpServerImpl : public net::HttpServer::Delegate { static void Create( NetAddressPtr local_address, HttpServerDelegatePtr delegate, - scoped_ptr<mojo::AppRefCount> app_refcount, + scoped_ptr<mojo::MessageLoopRef> app_refcount, const Callback<void(NetworkErrorPtr, NetAddressPtr)>& callback); net::HttpServer* server() { return server_.get(); } @@ -39,7 +39,7 @@ class HttpServerImpl : public net::HttpServer::Delegate { // notified that |delegate|'s pipe is closed. Deleting the object directly // before that is okay, too. HttpServerImpl(HttpServerDelegatePtr delegate, - scoped_ptr<mojo::AppRefCount> app_refcount); + scoped_ptr<mojo::MessageLoopRef> app_refcount); ~HttpServerImpl() override; int Start(NetAddressPtr local_address); @@ -55,7 +55,7 @@ class HttpServerImpl : public net::HttpServer::Delegate { void OnClose(int connection_id) override; HttpServerDelegatePtr delegate_; - scoped_ptr<mojo::AppRefCount> app_refcount_; + scoped_ptr<mojo::MessageLoopRef> app_refcount_; scoped_ptr<net::HttpServer> server_; std::map<int, linked_ptr<HttpConnectionImpl>> connections_; |