summaryrefslogtreecommitdiffstats
path: root/remoting/base/protocol_decoder.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/protocol_decoder.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/protocol_decoder.cc')
-rw-r--r--remoting/base/protocol_decoder.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/base/protocol_decoder.cc b/remoting/base/protocol_decoder.cc
index 3724f5a..0dc8441 100644
--- a/remoting/base/protocol_decoder.cc
+++ b/remoting/base/protocol_decoder.cc
@@ -18,12 +18,12 @@ ProtocolDecoder::ProtocolDecoder()
void ProtocolDecoder::ParseClientMessages(scoped_refptr<media::DataBuffer> data,
ClientMessageList* messages) {
- ParseMessages<ClientMessage>(data, messages);
+ ParseMessages<ChromotingClientMessage>(data, messages);
}
void ProtocolDecoder::ParseHostMessages(scoped_refptr<media::DataBuffer> data,
HostMessageList* messages) {
- ParseMessages<HostMessage>(data, messages);
+ ParseMessages<ChromotingHostMessage>(data, messages);
}
template <typename T>