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

Unified Diff: remoting/base/decoder_verbatim.cc

Issue 3161034: Rename (Host|Client)Message to Chromoting(Host|Client)Message. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Fix merge conflicts Created 10 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/base/decoder_verbatim.h ('k') | remoting/base/decoder_verbatim_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/base/decoder_verbatim.cc
diff --git a/remoting/base/decoder_verbatim.cc b/remoting/base/decoder_verbatim.cc
index af4f83bd15b301a2aa31ff8fbaa34dfaf706872a..b944bbcaf15d6f9f68ae438104d431607de46c28 100644
--- a/remoting/base/decoder_verbatim.cc
+++ b/remoting/base/decoder_verbatim.cc
@@ -42,8 +42,8 @@ bool DecoderVerbatim::BeginDecode(scoped_refptr<media::VideoFrame> frame,
return true;
}
-bool DecoderVerbatim::PartialDecode(HostMessage* message) {
- scoped_ptr<HostMessage> msg_deleter(message);
+bool DecoderVerbatim::PartialDecode(ChromotingHostMessage* message) {
+ scoped_ptr<ChromotingHostMessage> msg_deleter(message);
DCHECK(message->has_update_stream_packet());
DCHECK(started_);
@@ -70,7 +70,7 @@ void DecoderVerbatim::EndDecode() {
started_ = false;
}
-bool DecoderVerbatim::HandleBeginRect(HostMessage* message) {
+bool DecoderVerbatim::HandleBeginRect(ChromotingHostMessage* message) {
DCHECK_EQ(kWaitingForBeginRect, state_);
state_ = kWaitingForRectData;
@@ -94,7 +94,7 @@ bool DecoderVerbatim::HandleBeginRect(HostMessage* message) {
return true;
}
-bool DecoderVerbatim::HandleRectData(HostMessage* message) {
+bool DecoderVerbatim::HandleRectData(ChromotingHostMessage* message) {
DCHECK_EQ(kWaitingForRectData, state_);
DCHECK_EQ(0,
message->update_stream_packet().rect_data().sequence_number());
@@ -126,7 +126,7 @@ bool DecoderVerbatim::HandleRectData(HostMessage* message) {
return true;
}
-bool DecoderVerbatim::HandleEndRect(HostMessage* message) {
+bool DecoderVerbatim::HandleEndRect(ChromotingHostMessage* message) {
DCHECK_EQ(kWaitingForRectData, state_);
state_ = kWaitingForBeginRect;
return true;
« no previous file with comments | « remoting/base/decoder_verbatim.h ('k') | remoting/base/decoder_verbatim_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698