remoting/protocol/protobuf_video_writer.h - Issue 4313001: Rename classes for Chromoting:

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: remoting/protocol/protobuf_video_writer.h

Issue 4313001: Rename classes for Chromoting: (Closed) Base URL: http://git.chromium.org/git/chromium.git

Patch Set: Resolve merge conflicts Created 10 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: remoting/protocol/protobuf_video_writer.h

diff --git a/remoting/protocol/protobuf_video_writer.h b/remoting/protocol/protobuf_video_writer.h

index 02d3034ee20e3f7a9ef38115416bc110413b6434..c1ba1836cdc14164337e35c9f2530caee5ba70f4 100644

--- a/remoting/protocol/protobuf_video_writer.h

+++ b/remoting/protocol/protobuf_video_writer.h

@@ -10,6 +10,10 @@

namespace remoting {

+namespace protocol {

+class Session;

+} // namespace protocol

class BufferedSocketWriter;

class ProtobufVideoWriter : public VideoWriter {

@@ -18,7 +22,7 @@ class ProtobufVideoWriter : public VideoWriter {

virtual ~ProtobufVideoWriter();

// VideoWriter interface.

- virtual void Init(ChromotocolConnection* connection);

+ virtual void Init(protocol::Session* session);

virtual void SendPacket(const VideoPacket& packet);

virtual int GetPendingPackets();

virtual void Close();