diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-23 22:17:22 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-23 22:17:22 +0000 |
| commit | 6928c77fd5827419081b8b010c729419d6cd8e5a (patch) | |
| tree | 1902447112fa1c51b905ac53bb7e6fdd9b3c0f84 /remoting/host/session_manager.cc | |
| parent | 52ded45f70f0defc422d0fcf2b1cd873be839a69 (diff) | |
| download | chromium_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/host/session_manager.cc')
| -rw-r--r-- | remoting/host/session_manager.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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 |