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

Unified Diff: remoting/base/decoder_zlib.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_zlib.h ('k') | remoting/base/encoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/base/decoder_zlib.cc
diff --git a/remoting/base/decoder_zlib.cc b/remoting/base/decoder_zlib.cc
index 43a5fe20b2bd942168c883b05abce6f682f13fc1..8aabfbce1b5ecb90f358b571519cf9f8b4b9d3a9 100644
--- a/remoting/base/decoder_zlib.cc
+++ b/remoting/base/decoder_zlib.cc
@@ -53,8 +53,8 @@ bool DecoderZlib::BeginDecode(scoped_refptr<media::VideoFrame> frame,
return true;
}
-bool DecoderZlib::PartialDecode(HostMessage* message) {
- scoped_ptr<HostMessage> msg_deleter(message);
+bool DecoderZlib::PartialDecode(ChromotingHostMessage* message) {
+ scoped_ptr<ChromotingHostMessage> msg_deleter(message);
DCHECK(message->has_update_stream_packet());
DCHECK(started_);
@@ -82,7 +82,7 @@ void DecoderZlib::EndDecode() {
started_ = false;
}
-bool DecoderZlib::HandleBeginRect(HostMessage* message) {
+bool DecoderZlib::HandleBeginRect(ChromotingHostMessage* message) {
DCHECK_EQ(kWaitingForBeginRect, state_);
state_ = kWaitingForRectData;
@@ -108,7 +108,7 @@ bool DecoderZlib::HandleBeginRect(HostMessage* message) {
return true;
}
-bool DecoderZlib::HandleRectData(HostMessage* message) {
+bool DecoderZlib::HandleRectData(ChromotingHostMessage* message) {
DCHECK_EQ(kWaitingForRectData, state_);
DCHECK_EQ(0,
message->update_stream_packet().rect_data().sequence_number());
@@ -153,7 +153,7 @@ bool DecoderZlib::HandleRectData(HostMessage* message) {
return true;
}
-bool DecoderZlib::HandleEndRect(HostMessage* message) {
+bool DecoderZlib::HandleEndRect(ChromotingHostMessage* message) {
DCHECK_EQ(kWaitingForRectData, state_);
state_ = kWaitingForBeginRect;
« no previous file with comments | « remoting/base/decoder_zlib.h ('k') | remoting/base/encoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698