Chromium Code Reviews| Index: remoting/host/desktop_session_proxy.cc |
| diff --git a/remoting/host/desktop_session_proxy.cc b/remoting/host/desktop_session_proxy.cc |
| index 1e3ec991ff60467c34b8d25534b730007bb9c7c2..4649c94c0900a251160850e9d4efedeb7ad8b039 100644 |
| --- a/remoting/host/desktop_session_proxy.cc |
| +++ b/remoting/host/desktop_session_proxy.cc |
| @@ -19,6 +19,7 @@ |
| #include "remoting/host/ipc_event_executor.h" |
| #include "remoting/host/ipc_session_controller.h" |
| #include "remoting/host/ipc_video_frame_capturer.h" |
| +#include "remoting/host/screen_resolution.h" |
| #include "remoting/host/session_controller.h" |
| #include "remoting/proto/audio.pb.h" |
| #include "remoting/proto/control.pb.h" |
| @@ -279,6 +280,19 @@ void DesktopSessionProxy::StartEventExecutor( |
| client_clipboard_ = client_clipboard.Pass(); |
| } |
| +void DesktopSessionProxy::SetScreenResolution( |
|
Jamie
2013/03/15 18:33:24
For a CL that's primarily a global rename, I was s
alexeypa (please no reviews)
2013/03/15 20:30:41
This leaked from the follow up CL. I moved this co
|
| + const ScreenResolution& resolution) { |
| + DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
| + |
| + // Pass the client's resolution to the daemon. |
| + if (desktop_session_connector_) |
| + desktop_session_connector_->SetScreenResolution(this, resolution); |
| + |
| + // Pass the client's resolution to the DesktopSessionAgent instance. |
| + SendToDesktop( |
| + new ChromotingNetworkDesktopMsg_SetScreenResolution(resolution)); |
| +} |
| + |
| void DesktopSessionProxy::ConnectToDesktopSession( |
| base::WeakPtr<DesktopSessionConnector> desktop_session_connector, |
| bool virtual_terminal) { |
| @@ -288,7 +302,7 @@ void DesktopSessionProxy::ConnectToDesktopSession( |
| desktop_session_connector_ = desktop_session_connector; |
| desktop_session_connector_->ConnectTerminal( |
| - this, DesktopSessionParams(), virtual_terminal); |
| + this, ScreenResolution(), virtual_terminal); |
| } |
| DesktopSessionProxy::~DesktopSessionProxy() { |