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

Unified Diff: remoting/protocol/rtp_video_writer.h

Issue 7604021: Revert 96089 - 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/rtp_video_reader_unittest.cc ('k') | remoting/protocol/rtp_video_writer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/rtp_video_writer.h
===================================================================
--- remoting/protocol/rtp_video_writer.h (revision 96105)
+++ remoting/protocol/rtp_video_writer.h (working copy)
@@ -5,7 +5,6 @@
#ifndef REMOTING_PROTOCOL_RTP_VIDEO_WRITER_H_
#define REMOTING_PROTOCOL_RTP_VIDEO_WRITER_H_
-#include "base/memory/scoped_ptr.h"
#include "remoting/protocol/rtp_writer.h"
#include "remoting/protocol/video_writer.h"
@@ -20,8 +19,7 @@
virtual ~RtpVideoWriter();
// VideoWriter interface.
- virtual void Init(protocol::Session* session,
- const InitializedCallback& callback) OVERRIDE;
+ virtual void Init(protocol::Session* session) OVERRIDE;
virtual void Close() OVERRIDE;
// VideoStub interface.
@@ -30,14 +28,7 @@
virtual int GetPendingPackets() OVERRIDE;
private:
- void OnChannelReady(const std::string& name, net::Socket* socket);
-
- bool initialized_;
- InitializedCallback initialized_callback_;
-
- scoped_ptr<net::Socket> rtp_channel_;
RtpWriter rtp_writer_;
- scoped_ptr<net::Socket> rtcp_channel_;
DISALLOW_COPY_AND_ASSIGN(RtpVideoWriter);
};
« no previous file with comments | « remoting/protocol/rtp_video_reader_unittest.cc ('k') | remoting/protocol/rtp_video_writer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698