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

Unified Diff: remoting/host/remoting_me2me_host.cc

Issue 11364112: Merge 165565 - Calling SendSAS() from a service to make sure that Secure Attention Sequence can be … (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1312/src/
Patch Set: Created 8 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/chromoting_messages.h ('k') | remoting/host/sas_injector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/remoting_me2me_host.cc
===================================================================
--- remoting/host/remoting_me2me_host.cc (revision 166306)
+++ remoting/host/remoting_me2me_host.cc (working copy)
@@ -148,6 +148,9 @@
void SigTermHandler(int signal_number);
#endif
+ // Asks the daemon to inject Secure Attention Sequence to the console.
+ void SendSasToConsole();
+
void ShutdownHostProcess();
// Applies the host config, returning true if successful.
@@ -459,7 +462,8 @@
#else // !defined(REMOTING_MULTI_PROCESS)
DesktopEnvironmentFactory* desktop_environment_factory =
new SessionDesktopEnvironmentFactory(
- context_->input_task_runner(), context_->ui_task_runner());
+ context_->input_task_runner(), context_->ui_task_runner(),
+ base::Bind(&HostProcess::SendSasToConsole, base::Unretained(this)));
#endif // !defined(REMOTING_MULTI_PROCESS)
#else // !defined(OS_WIN)
@@ -506,6 +510,13 @@
return exit_code_;
}
+void HostProcess::SendSasToConsole() {
+ DCHECK(context_->ui_task_runner()->BelongsToCurrentThread());
+
+ if (daemon_channel_)
+ daemon_channel_->Send(new ChromotingNetworkDaemonMsg_SendSasToConsole());
+}
+
void HostProcess::ShutdownHostProcess() {
DCHECK(context_->ui_task_runner()->BelongsToCurrentThread());
« no previous file with comments | « remoting/host/chromoting_messages.h ('k') | remoting/host/sas_injector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698