summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorkxing@chromium.org <kxing@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 19:27:22 +0000
committerkxing@chromium.org <kxing@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 19:27:22 +0000
commita24884bf81e66c7ee45c0d113460059470b123d8 (patch)
treeeb660714cb58b8c02021ce1be5d78b948a5b548f /remoting
parenta3ed8b6f8ce7336594049ad20aa4f9ecd95db006 (diff)
downloadchromium_src-a24884bf81e66c7ee45c0d113460059470b123d8.zip
chromium_src-a24884bf81e66c7ee45c0d113460059470b123d8.tar.gz
chromium_src-a24884bf81e66c7ee45c0d113460059470b123d8.tar.bz2
Renamed VideoStub::GetPendingPackets() to VideoStub::GetPendingVideoPackets()
BUG=133823 Review URL: https://chromiumcodereview.appspot.com/10662021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/client/chromoting_client.cc2
-rw-r--r--remoting/client/chromoting_client.h2
-rw-r--r--remoting/protocol/protobuf_video_writer.cc2
-rw-r--r--remoting/protocol/protobuf_video_writer.h2
-rw-r--r--remoting/protocol/protocol_mock_objects.h2
-rw-r--r--remoting/protocol/video_stub.h2
6 files changed, 6 insertions, 6 deletions
diff --git a/remoting/client/chromoting_client.cc b/remoting/client/chromoting_client.cc
index a150b67..f118667 100644
--- a/remoting/client/chromoting_client.cc
+++ b/remoting/client/chromoting_client.cc
@@ -136,7 +136,7 @@ void ChromotingClient::ProcessVideoPacket(scoped_ptr<VideoPacket> packet,
DispatchPacket();
}
-int ChromotingClient::GetPendingPackets() {
+int ChromotingClient::GetPendingVideoPackets() {
DCHECK(task_runner_->BelongsToCurrentThread());
return received_packets_.size();
}
diff --git a/remoting/client/chromoting_client.h b/remoting/client/chromoting_client.h
index 3199da1..03ef41c 100644
--- a/remoting/client/chromoting_client.h
+++ b/remoting/client/chromoting_client.h
@@ -73,7 +73,7 @@ class ChromotingClient : public protocol::ConnectionToHost::HostEventCallback,
// VideoStub implementation.
virtual void ProcessVideoPacket(scoped_ptr<VideoPacket> packet,
const base::Closure& done) OVERRIDE;
- virtual int GetPendingPackets() OVERRIDE;
+ virtual int GetPendingVideoPackets() OVERRIDE;
// AudioStub implementation.
virtual void ProcessAudioPacket(scoped_ptr<AudioPacket> packet,
diff --git a/remoting/protocol/protobuf_video_writer.cc b/remoting/protocol/protobuf_video_writer.cc
index a0ca271..12dd6611a 100644
--- a/remoting/protocol/protobuf_video_writer.cc
+++ b/remoting/protocol/protobuf_video_writer.cc
@@ -65,7 +65,7 @@ void ProtobufVideoWriter::ProcessVideoPacket(scoped_ptr<VideoPacket> packet,
buffered_writer_.Write(SerializeAndFrameMessage(*packet), done);
}
-int ProtobufVideoWriter::GetPendingPackets() {
+int ProtobufVideoWriter::GetPendingVideoPackets() {
return buffered_writer_.GetBufferChunks();
}
diff --git a/remoting/protocol/protobuf_video_writer.h b/remoting/protocol/protobuf_video_writer.h
index c5fa321..83f551c 100644
--- a/remoting/protocol/protobuf_video_writer.h
+++ b/remoting/protocol/protobuf_video_writer.h
@@ -36,7 +36,7 @@ class ProtobufVideoWriter : public VideoWriter {
// VideoStub interface.
virtual void ProcessVideoPacket(scoped_ptr<VideoPacket> packet,
const base::Closure& done) OVERRIDE;
- virtual int GetPendingPackets() OVERRIDE;
+ virtual int GetPendingVideoPackets() OVERRIDE;
private:
void OnChannelReady(scoped_ptr<net::StreamSocket> socket);
diff --git a/remoting/protocol/protocol_mock_objects.h b/remoting/protocol/protocol_mock_objects.h
index 21ab938..e9875f8 100644
--- a/remoting/protocol/protocol_mock_objects.h
+++ b/remoting/protocol/protocol_mock_objects.h
@@ -141,7 +141,7 @@ class MockVideoStub : public VideoStub {
ProcessVideoPacketPtr(video_packet.get(), done);
}
- MOCK_METHOD0(GetPendingPackets, int());
+ MOCK_METHOD0(GetPendingVideoPackets, int());
private:
DISALLOW_COPY_AND_ASSIGN(MockVideoStub);
diff --git a/remoting/protocol/video_stub.h b/remoting/protocol/video_stub.h
index 801f02f..20ab8ed 100644
--- a/remoting/protocol/video_stub.h
+++ b/remoting/protocol/video_stub.h
@@ -25,7 +25,7 @@ class VideoStub {
const base::Closure& done) = 0;
// Returns number of packets currently pending in the buffer.
- virtual int GetPendingPackets() = 0;
+ virtual int GetPendingVideoPackets() = 0;
protected:
VideoStub() { }