summaryrefslogtreecommitdiffstats
path: root/remoting/host/client_connection.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/host/client_connection.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/host/client_connection.cc')
-rw-r--r--remoting/host/client_connection.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/remoting/host/client_connection.cc b/remoting/host/client_connection.cc
index 6c8516a..b6e8759 100644
--- a/remoting/host/client_connection.cc
+++ b/remoting/host/client_connection.cc
@@ -38,10 +38,10 @@ ClientConnection::~ClientConnection() {
// static
scoped_refptr<media::DataBuffer>
ClientConnection::CreateWireFormatDataBuffer(
- const HostMessage* msg) {
+ const ChromotingHostMessage* msg) {
// TODO(hclam): Instead of serializing |msg| create an DataBuffer
// object that wraps around it.
- scoped_ptr<const HostMessage> message_deleter(msg);
+ scoped_ptr<const ChromotingHostMessage> message_deleter(msg);
return SerializeAndFrameMessage(*msg);
}
@@ -53,7 +53,7 @@ void ClientConnection::SendInitClientMessage(int width, int height) {
if (!channel_)
return;
- HostMessage msg;
+ ChromotingHostMessage msg;
msg.mutable_init_client()->set_width(width);
msg.mutable_init_client()->set_height(height);
DCHECK(msg.IsInitialized());
@@ -67,7 +67,7 @@ void ClientConnection::SendBeginUpdateStreamMessage() {
if (!channel_)
return;
- HostMessage msg;
+ ChromotingHostMessage msg;
msg.mutable_begin_update_stream();
DCHECK(msg.IsInitialized());
@@ -96,7 +96,7 @@ void ClientConnection::SendEndUpdateStreamMessage() {
if (!channel_)
return;
- HostMessage msg;
+ ChromotingHostMessage msg;
msg.mutable_end_update_stream();
DCHECK(msg.IsInitialized());