Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(393)

Unified Diff: remoting/host/desktop_session_proxy.cc

Issue 2468523003: Pass the desktop session ID to the remoting network process. (Closed)
Patch Set: rebase Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/desktop_session_proxy.h ('k') | remoting/host/desktop_session_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/desktop_session_proxy.cc
diff --git a/remoting/host/desktop_session_proxy.cc b/remoting/host/desktop_session_proxy.cc
index 2e924d5b2423f3c2841226cf4db644365b621d11..3528be0d45c21c81bee141aafa8fb519e2c54d35 100644
--- a/remoting/host/desktop_session_proxy.cc
+++ b/remoting/host/desktop_session_proxy.cc
@@ -202,13 +202,6 @@ void DesktopSessionProxy::OnChannelConnected(int32_t peer_pid) {
DCHECK(caller_task_runner_->BelongsToCurrentThread());
VLOG(1) << "IPC: network <- desktop (" << peer_pid << ")";
-
-#if defined(OS_WIN)
- if (!ProcessIdToSessionId(peer_pid,
- reinterpret_cast<DWORD*>(&desktop_session_id_))) {
- PLOG(ERROR) << "ProcessIdToSessionId() failed!";
- }
-#endif // defined(OS_WIN)
}
void DesktopSessionProxy::OnChannelError() {
@@ -218,7 +211,8 @@ void DesktopSessionProxy::OnChannelError() {
}
bool DesktopSessionProxy::AttachToDesktop(
- const IPC::ChannelHandle& desktop_pipe) {
+ const IPC::ChannelHandle& desktop_pipe,
+ int session_id) {
DCHECK(caller_task_runner_->BelongsToCurrentThread());
DCHECK(!desktop_channel_);
@@ -239,6 +233,8 @@ bool DesktopSessionProxy::AttachToDesktop(
screen_resolution_,
virtual_terminal_));
+ desktop_session_id_ = session_id;
+
return true;
}
« no previous file with comments | « remoting/host/desktop_session_proxy.h ('k') | remoting/host/desktop_session_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698