Chromium Code Reviews| Index: remoting/host/chromoting_host.cc |
| diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc |
| index 5071400a21c19b04a0fb0e90d9cc36241f9ea0b6..b925e36157b026f4045949c395b49e335be4b78e 100644 |
| --- a/remoting/host/chromoting_host.cc |
| +++ b/remoting/host/chromoting_host.cc |
| @@ -339,18 +339,10 @@ void ChromotingHost::OnIncomingSession( |
| clients_.push_back(client); |
| } |
| -void ChromotingHost::set_protocol_config( |
| - protocol::CandidateSessionConfig* config) { |
| - DCHECK(context_->network_message_loop()->BelongsToCurrentThread()); |
| - DCHECK(config); |
| - DCHECK_EQ(state_, kInitial); |
| - protocol_config_.reset(config); |
| -} |
|
Jamie
2012/05/25 21:19:24
Did these functions need to be re-ordered? AFACT,
Sergey Ulanov
2012/05/25 21:59:30
I reordered them so that they are in the same orde
|
| - |
| -void ChromotingHost::LocalMouseMoved(const SkIPoint& new_pos) { |
| +void ChromotingHost::OnMouseMoved(const SkIPoint& new_pos) { |
| if (!context_->network_message_loop()->BelongsToCurrentThread()) { |
| context_->network_message_loop()->PostTask( |
| - FROM_HERE, base::Bind(&ChromotingHost::LocalMouseMoved, this, new_pos)); |
| + FROM_HERE, base::Bind(&ChromotingHost::OnMouseMoved, this, new_pos)); |
| return; |
| } |
| @@ -360,6 +352,14 @@ void ChromotingHost::LocalMouseMoved(const SkIPoint& new_pos) { |
| } |
| } |
| +void ChromotingHost::set_protocol_config( |
| + protocol::CandidateSessionConfig* config) { |
| + DCHECK(context_->network_message_loop()->BelongsToCurrentThread()); |
| + DCHECK(config); |
| + DCHECK_EQ(state_, kInitial); |
| + protocol_config_.reset(config); |
| +} |
| + |
| void ChromotingHost::PauseSession(bool pause) { |
| if (!context_->network_message_loop()->BelongsToCurrentThread()) { |
| context_->network_message_loop()->PostTask( |