Index: remoting/host/desktop_session_win.cc |
diff --git a/remoting/host/desktop_session_win.cc b/remoting/host/desktop_session_win.cc |
index 8472e127160aad5e375fc2f7570311ac210a5b40..fd1bc0796d73973daa7be391f723569b32c64ae6 100644 |
--- a/remoting/host/desktop_session_win.cc |
+++ b/remoting/host/desktop_session_win.cc |
@@ -9,6 +9,7 @@ |
#include "remoting/base/auto_thread_task_runner.h" |
#include "remoting/host/chromoting_messages.h" |
#include "remoting/host/daemon_process.h" |
+#include "remoting/host/sas_injector.h" |
#include "remoting/host/win/worker_process_launcher.h" |
#include "remoting/host/win/wts_console_monitor.h" |
#include "remoting/host/win/wts_session_process_delegate.h" |
@@ -72,6 +73,8 @@ bool DesktopSessionWin::OnMessageReceived(const IPC::Message& message) { |
IPC_BEGIN_MESSAGE_MAP(DesktopSessionWin, message) |
IPC_MESSAGE_HANDLER(ChromotingDesktopDaemonMsg_DesktopAttached, |
OnDesktopSessionAgentAttached) |
+ IPC_MESSAGE_HANDLER(ChromotingDesktopDaemonMsg_InjectSas, |
+ OnInjectSas) |
IPC_MESSAGE_UNHANDLED(handled = false) |
IPC_END_MESSAGE_MAP() |
return handled; |
@@ -128,6 +131,18 @@ void DesktopSessionWin::OnDesktopSessionAgentAttached( |
} |
} |
+void DesktopSessionWin::OnInjectSas() { |
+ DCHECK(main_task_runner_->BelongsToCurrentThread()); |
+ |
+ if (!launcher_) |
+ return; |
Jamie
2012/12/06 21:42:25
This check seems unnecessary, since you're not usi
alexeypa (please no reviews)
2012/12/06 21:56:02
This check is required for the case when OnInjectS
Jamie
2012/12/06 22:07:09
Okay, maybe a comment would be useful to indicate
alexeypa (please no reviews)
2012/12/06 22:38:51
Done.
|
+ |
+ if (!sas_injector_) |
+ sas_injector_ = SasInjector::Create(); |
+ if (!sas_injector_->InjectSas()) |
+ LOG(ERROR) << "Failed to inject Secure Attention Sequence."; |
+} |
+ |
void DesktopSessionWin::RestartDesktopProcess( |
const tracked_objects::Location& location) { |
DCHECK(main_task_runner_->BelongsToCurrentThread()); |