From 6928c77fd5827419081b8b010c729419d6cd8e5a Mon Sep 17 00:00:00 2001 From: "thestig@chromium.org" Date: Mon, 23 Aug 2010 22:17:22 +0000 Subject: 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 --- remoting/host/session_manager.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'remoting/host/session_manager.cc') diff --git a/remoting/host/session_manager.cc b/remoting/host/session_manager.cc index b8747dd..f2cb3aa 100644 --- a/remoting/host/session_manager.cc +++ b/remoting/host/session_manager.cc @@ -319,7 +319,7 @@ void SessionManager::DoRateControl() { ScheduleNextRateControl(); } -void SessionManager::DoSendUpdate(ChromotingHostMessage* message, +void SessionManager::DoSendUpdate(HostMessage* message, Encoder::EncodingState state) { DCHECK_EQ(network_loop_, MessageLoop::current()); @@ -393,7 +393,7 @@ void SessionManager::DoEncode( } void SessionManager::EncodeDataAvailableTask( - ChromotingHostMessage* message, Encoder::EncodingState state) { + HostMessage* message, Encoder::EncodingState state) { DCHECK_EQ(encode_loop_, MessageLoop::current()); // Before a new encode task starts, notify clients a new update -- cgit v1.1