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

Unified Diff: remoting/protocol/protobuf_video_writer.h

Issue 7508044: Remove video_channel() from Session interface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 9 years, 4 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 | « remoting/protocol/protobuf_video_reader.cc ('k') | remoting/protocol/protobuf_video_writer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « remoting/protocol/protobuf_video_reader.cc ('k') | remoting/protocol/protobuf_video_writer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698