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

Unified Diff: mojo/services/network/web_socket_impl.h

Issue 1227373002: Roll mojo SDK to 734c6e1652ff2f3b696e441722838f453f4f9b42 (Closed) Base URL: https://github.com/domokit/monet.git@master
Patch Set: Follow review Created 5 years, 5 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/url_loader_impl.cc ('k') | mojo/services/network/web_socket_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/network/web_socket_impl.h
diff --git a/mojo/services/network/web_socket_impl.h b/mojo/services/network/web_socket_impl.h
index bb41104044d4a3be474a4aae7e9d51625bafcd5b..f84f8402f1f70025fb2fd62147f8e331b908f427 100644
--- a/mojo/services/network/web_socket_impl.h
+++ b/mojo/services/network/web_socket_impl.h
@@ -7,7 +7,7 @@
#include "base/memory/scoped_ptr.h"
#include "mojo/services/network/public/interfaces/web_socket.mojom.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
namespace net {
class WebSocketChannel;
@@ -19,9 +19,9 @@ class WebSocketReadQueue;
// Forms a bridge between the WebSocket mojo interface and the net::WebSocket
// implementation.
-class WebSocketImpl : public InterfaceImpl<WebSocket> {
+class WebSocketImpl : public WebSocket {
public:
- explicit WebSocketImpl(NetworkContext* context);
+ WebSocketImpl(InterfaceRequest<WebSocket> request, NetworkContext* context);
~WebSocketImpl() override;
private:
@@ -41,6 +41,7 @@ class WebSocketImpl : public InterfaceImpl<WebSocket> {
uint32_t num_bytes,
const char* data);
+ StrongBinding<WebSocket> binding_;
// The channel we use to send events to the network.
scoped_ptr<net::WebSocketChannel> channel_;
ScopedDataPipeConsumerHandle send_stream_;
« no previous file with comments | « mojo/services/network/url_loader_impl.cc ('k') | mojo/services/network/web_socket_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698