| Index: remoting/protocol/protobuf_video_writer.h
|
| diff --git a/remoting/protocol/protobuf_video_writer.h b/remoting/protocol/protobuf_video_writer.h
|
| index 189eacfce6179e29fc49cec8b837f4a2c98033bf..a5bb4fce296c1b4f2f67053d7b8d16af743e2773 100644
|
| --- a/remoting/protocol/protobuf_video_writer.h
|
| +++ b/remoting/protocol/protobuf_video_writer.h
|
| @@ -5,10 +5,17 @@
|
| #ifndef REMOTING_PROTOCOL_PROTOBUF_VIDEO_WRITER_H_
|
| #define REMOTING_PROTOCOL_PROTOBUF_VIDEO_WRITER_H_
|
|
|
| +#include <string>
|
| +
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/ref_counted.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "remoting/protocol/video_writer.h"
|
|
|
| +namespace net {
|
| +class StreamSocket;
|
| +} // namespace net
|
| +
|
| namespace remoting {
|
| namespace protocol {
|
|
|
| @@ -21,7 +28,8 @@ class ProtobufVideoWriter : public VideoWriter {
|
| virtual ~ProtobufVideoWriter();
|
|
|
| // VideoWriter interface.
|
| - virtual void Init(protocol::Session* session) OVERRIDE;
|
| + virtual void Init(protocol::Session* session,
|
| + const InitializedCallback& callback) OVERRIDE;
|
| virtual void Close() OVERRIDE;
|
|
|
| // VideoStub interface.
|
| @@ -30,6 +38,13 @@ class ProtobufVideoWriter : public VideoWriter {
|
| virtual int GetPendingPackets() OVERRIDE;
|
|
|
| private:
|
| + void OnChannelReady(const std::string& name, net::StreamSocket* socket);
|
| +
|
| + InitializedCallback initialized_callback_;
|
| +
|
| + // TODO(sergeyu): Remove |channel_| and let |buffered_writer_| own it.
|
| + scoped_ptr<net::StreamSocket> channel_;
|
| +
|
| scoped_refptr<BufferedSocketWriter> buffered_writer_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ProtobufVideoWriter);
|
|
|