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/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
397 mouse_shape_pump_.reset(); | 397 mouse_shape_pump_.reset(); |
398 client_clipboard_factory_.InvalidateWeakPtrs(); | 398 client_clipboard_factory_.InvalidateWeakPtrs(); |
399 input_injector_.reset(); | 399 input_injector_.reset(); |
400 screen_controls_.reset(); | 400 screen_controls_.reset(); |
401 desktop_environment_.reset(); | 401 desktop_environment_.reset(); |
402 | 402 |
403 // Notify the ChromotingHost that this client is disconnected. | 403 // Notify the ChromotingHost that this client is disconnected. |
404 event_handler_->OnSessionClosed(this); | 404 event_handler_->OnSessionClosed(this); |
405 } | 405 } |
406 | 406 |
407 void ClientSession::OnEventTimestamp(protocol::ConnectionToClient* connection, | 407 void ClientSession::OnInputEventReceived( |
408 int64 timestamp) { | 408 protocol::ConnectionToClient* connection, |
| 409 int64_t event_timestamp) { |
409 DCHECK(CalledOnValidThread()); | 410 DCHECK(CalledOnValidThread()); |
410 DCHECK_EQ(connection_.get(), connection); | 411 DCHECK_EQ(connection_.get(), connection); |
411 | 412 |
412 if (video_frame_pump_.get()) | 413 if (video_frame_pump_.get()) |
413 video_frame_pump_->SetLatestEventTimestamp(timestamp); | 414 video_frame_pump_->OnInputEventReceived(event_timestamp); |
414 } | 415 } |
415 | 416 |
416 void ClientSession::OnRouteChange( | 417 void ClientSession::OnRouteChange( |
417 protocol::ConnectionToClient* connection, | 418 protocol::ConnectionToClient* connection, |
418 const std::string& channel_name, | 419 const std::string& channel_name, |
419 const protocol::TransportRoute& route) { | 420 const protocol::TransportRoute& route) { |
420 DCHECK(CalledOnValidThread()); | 421 DCHECK(CalledOnValidThread()); |
421 DCHECK_EQ(connection_.get(), connection); | 422 DCHECK_EQ(connection_.get(), connection); |
422 event_handler_->OnSessionRouteChange(this, channel_name, route); | 423 event_handler_->OnSessionRouteChange(this, channel_name, route); |
423 } | 424 } |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
507 | 508 |
508 scoped_ptr<protocol::ClipboardStub> ClientSession::CreateClipboardProxy() { | 509 scoped_ptr<protocol::ClipboardStub> ClientSession::CreateClipboardProxy() { |
509 DCHECK(CalledOnValidThread()); | 510 DCHECK(CalledOnValidThread()); |
510 | 511 |
511 return make_scoped_ptr( | 512 return make_scoped_ptr( |
512 new protocol::ClipboardThreadProxy(client_clipboard_factory_.GetWeakPtr(), | 513 new protocol::ClipboardThreadProxy(client_clipboard_factory_.GetWeakPtr(), |
513 base::ThreadTaskRunnerHandle::Get())); | 514 base::ThreadTaskRunnerHandle::Get())); |
514 } | 515 } |
515 | 516 |
516 } // namespace remoting | 517 } // namespace remoting |
OLD | NEW |