| 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/desktop_session_proxy.h" | 5 #include "remoting/host/desktop_session_proxy.h" |
| 6 | 6 |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/platform_file.h" | 9 #include "base/platform_file.h" |
| 10 #include "base/process_util.h" | 10 #include "base/process_util.h" |
| (...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 365 scoped_ptr<protocol::ClipboardStub> client_clipboard) { | 365 scoped_ptr<protocol::ClipboardStub> client_clipboard) { |
| 366 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 366 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
| 367 | 367 |
| 368 client_clipboard_ = client_clipboard.Pass(); | 368 client_clipboard_ = client_clipboard.Pass(); |
| 369 } | 369 } |
| 370 | 370 |
| 371 void DesktopSessionProxy::SetScreenResolution( | 371 void DesktopSessionProxy::SetScreenResolution( |
| 372 const ScreenResolution& resolution) { | 372 const ScreenResolution& resolution) { |
| 373 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 373 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
| 374 | 374 |
| 375 if (!resolution.IsEmpty()) | 375 if (resolution.IsEmpty()) |
| 376 return; | 376 return; |
| 377 | 377 |
| 378 screen_resolution_ = resolution; | 378 screen_resolution_ = resolution; |
| 379 | 379 |
| 380 // Connect to the desktop session if it is not done yet. | 380 // Connect to the desktop session if it is not done yet. |
| 381 if (!is_desktop_session_connected_) { | 381 if (!is_desktop_session_connected_) { |
| 382 is_desktop_session_connected_ = true; | 382 is_desktop_session_connected_ = true; |
| 383 if (desktop_session_connector_) { | 383 if (desktop_session_connector_) { |
| 384 desktop_session_connector_->ConnectTerminal(this, screen_resolution_, | 384 desktop_session_connector_->ConnectTerminal(this, screen_resolution_, |
| 385 virtual_terminal_); | 385 virtual_terminal_); |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 539 } | 539 } |
| 540 | 540 |
| 541 // static | 541 // static |
| 542 void DesktopSessionProxyTraits::Destruct( | 542 void DesktopSessionProxyTraits::Destruct( |
| 543 const DesktopSessionProxy* desktop_session_proxy) { | 543 const DesktopSessionProxy* desktop_session_proxy) { |
| 544 desktop_session_proxy->caller_task_runner_->DeleteSoon(FROM_HERE, | 544 desktop_session_proxy->caller_task_runner_->DeleteSoon(FROM_HERE, |
| 545 desktop_session_proxy); | 545 desktop_session_proxy); |
| 546 } | 546 } |
| 547 | 547 |
| 548 } // namespace remoting | 548 } // namespace remoting |
| OLD | NEW |