summaryrefslogtreecommitdiffstats
path: root/remoting/base/decoder_zlib.cc
diff options
context:
space:
mode:
authorgarykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-24 23:05:05 +0000
committergarykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-24 23:05:05 +0000
commit53a4597d56e4ca47d70a0f72901d005f0019aca3 (patch)
tree794a2e9af105a28cfacf7b9ae77d7852985bd87c /remoting/base/decoder_zlib.cc
parentfebe94524deeb320646d623cd91ed87e1db67a7b (diff)
downloadchromium_src-53a4597d56e4ca47d70a0f72901d005f0019aca3.zip
chromium_src-53a4597d56e4ca47d70a0f72901d005f0019aca3.tar.gz
chromium_src-53a4597d56e4ca47d70a0f72901d005f0019aca3.tar.bz2
Rename (Host|Client)Message to Chromoting(Host|Client)Message.
Rename HostMessage and ClientMessage to Chromoting{Host|Client}Message to avoid conflicts with messages in X11. Actually, only ClientMessage needs to be changed due to conflict, but HostMessage is changed to keep the names consistent. BUG=none TEST=remoting unittests Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=57112 Review URL: http://codereview.chromium.org/3161034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57255 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/base/decoder_zlib.cc')
-rw-r--r--remoting/base/decoder_zlib.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/remoting/base/decoder_zlib.cc b/remoting/base/decoder_zlib.cc
index 43a5fe2..8aabfbc 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;