| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "remoting/host/client_session.h" | 5 #include "remoting/host/client_session.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/message_loop/message_loop_proxy.h" | 9 #include "base/message_loop/message_loop_proxy.h" |
| 10 #include "remoting/base/capabilities.h" | 10 #include "remoting/base/capabilities.h" |
| (...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 390 DCHECK(CalledOnValidThread()); | 390 DCHECK(CalledOnValidThread()); |
| 391 DCHECK(connection_.get()); | 391 DCHECK(connection_.get()); |
| 392 | 392 |
| 393 max_duration_timer_.Stop(); | 393 max_duration_timer_.Stop(); |
| 394 | 394 |
| 395 // This triggers OnConnectionClosed(), and the session may be destroyed | 395 // This triggers OnConnectionClosed(), and the session may be destroyed |
| 396 // as the result, so this call must be the last in this method. | 396 // as the result, so this call must be the last in this method. |
| 397 connection_->Disconnect(); | 397 connection_->Disconnect(); |
| 398 } | 398 } |
| 399 | 399 |
| 400 void ClientSession::OnLocalMouseMoved(const SkIPoint& position) { | 400 void ClientSession::OnLocalMouseMoved(const webrtc::DesktopVector& position) { |
| 401 DCHECK(CalledOnValidThread()); | 401 DCHECK(CalledOnValidThread()); |
| 402 remote_input_filter_.LocalMouseMoved(position); | 402 remote_input_filter_.LocalMouseMoved(position); |
| 403 } | 403 } |
| 404 | 404 |
| 405 void ClientSession::SetDisableInputs(bool disable_inputs) { | 405 void ClientSession::SetDisableInputs(bool disable_inputs) { |
| 406 DCHECK(CalledOnValidThread()); | 406 DCHECK(CalledOnValidThread()); |
| 407 | 407 |
| 408 if (disable_inputs) | 408 if (disable_inputs) |
| 409 input_tracker_.ReleaseAll(); | 409 input_tracker_.ReleaseAll(); |
| 410 | 410 |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 444 return scoped_ptr<AudioEncoder>(new AudioEncoderVerbatim()); | 444 return scoped_ptr<AudioEncoder>(new AudioEncoderVerbatim()); |
| 445 } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) { | 445 } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) { |
| 446 return scoped_ptr<AudioEncoder>(new AudioEncoderOpus()); | 446 return scoped_ptr<AudioEncoder>(new AudioEncoderOpus()); |
| 447 } | 447 } |
| 448 | 448 |
| 449 NOTREACHED(); | 449 NOTREACHED(); |
| 450 return scoped_ptr<AudioEncoder>(); | 450 return scoped_ptr<AudioEncoder>(); |
| 451 } | 451 } |
| 452 | 452 |
| 453 } // namespace remoting | 453 } // namespace remoting |
| OLD | NEW |