summaryrefslogtreecommitdiffstats
path: root/remoting/client/chromoting_client.h
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-23 22:17:22 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-23 22:17:22 +0000
commit6928c77fd5827419081b8b010c729419d6cd8e5a (patch)
tree1902447112fa1c51b905ac53bb7e6fdd9b3c0f84 /remoting/client/chromoting_client.h
parent52ded45f70f0defc422d0fcf2b1cd873be839a69 (diff)
downloadchromium_src-6928c77fd5827419081b8b010c729419d6cd8e5a.zip
chromium_src-6928c77fd5827419081b8b010c729419d6cd8e5a.tar.gz
chromium_src-6928c77fd5827419081b8b010c729419d6cd8e5a.tar.bz2
Revert 57112 - 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 Review URL: http://codereview.chromium.org/3161034 TBR=garykac@chromium.org Review URL: http://codereview.chromium.org/3141036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57115 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client/chromoting_client.h')
-rw-r--r--remoting/client/chromoting_client.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/remoting/client/chromoting_client.h b/remoting/client/chromoting_client.h
index c7026e3..bdc2e26 100644
--- a/remoting/client/chromoting_client.h
+++ b/remoting/client/chromoting_client.h
@@ -65,10 +65,10 @@ class ChromotingClient : public HostConnection::HostEventCallback {
void SetState(State s);
// Handles for chromotocol messages.
- void InitClient(ChromotingHostMessage* msg);
- void BeginUpdate(ChromotingHostMessage* msg);
- void HandleUpdate(ChromotingHostMessage* msg);
- void EndUpdate(ChromotingHostMessage* msg);
+ void InitClient(HostMessage* msg);
+ void BeginUpdate(HostMessage* msg);
+ void HandleUpdate(HostMessage* msg);
+ void EndUpdate(HostMessage* msg);
// The following are not owned by this class.
ClientConfig config_;