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

Unified Diff: remoting/host/desktop_process.cc

Issue 11447021: Added support of Secure Attention Sequence in multiprocess mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years 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_process.h ('k') | remoting/host/desktop_session_agent.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/desktop_process.cc
diff --git a/remoting/host/desktop_process.cc b/remoting/host/desktop_process.cc
index 6997e22193baa60b8d9006be4a034683bb65e523..464b7d42026d6817a253eed89dfe14ff716f6adb 100644
--- a/remoting/host/desktop_process.cc
+++ b/remoting/host/desktop_process.cc
@@ -34,6 +34,18 @@ DesktopProcess::~DesktopProcess() {
DCHECK(!desktop_agent_);
}
+void DesktopProcess::OnNetworkProcessDisconnected() {
+ DCHECK(caller_task_runner_->BelongsToCurrentThread());
+
+ OnChannelError();
+}
+
+void DesktopProcess::InjectSas() {
+ DCHECK(caller_task_runner_->BelongsToCurrentThread());
+
+ daemon_channel_->Send(new ChromotingDesktopDaemonMsg_InjectSas());
+}
+
bool DesktopProcess::OnMessageReceived(const IPC::Message& message) {
DCHECK(caller_task_runner_->BelongsToCurrentThread());
@@ -84,13 +96,9 @@ bool DesktopProcess::Start() {
io_task_runner,
video_capture_task_runner);
- // Start the agent and create an IPC channel to talk to it. It is safe to
- // use base::Unretained(this) here because the message loop below will run
- // until |desktop_agent_| is completely destroyed.
+ // Start the agent and create an IPC channel to talk to it.
IPC::PlatformFileForTransit desktop_pipe;
- if (!desktop_agent_->Start(base::Bind(&DesktopProcess::OnChannelError,
- base::Unretained(this)),
- &desktop_pipe)) {
+ if (!desktop_agent_->Start(AsWeakPtr(), &desktop_pipe)) {
desktop_agent_ = NULL;
caller_task_runner_ = NULL;
return false;
« no previous file with comments | « remoting/host/desktop_process.h ('k') | remoting/host/desktop_session_agent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698