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

Side by Side Diff: remoting/host/desktop_session_win.cc

Issue 11447021: Added support of Secure Attention Sequence in multiprocess mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/host/desktop_session_win.h" 5 #include "remoting/host/desktop_session_win.h"
6 6
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "ipc/ipc_message_macros.h" 8 #include "ipc/ipc_message_macros.h"
9 #include "remoting/base/auto_thread_task_runner.h" 9 #include "remoting/base/auto_thread_task_runner.h"
10 #include "remoting/host/chromoting_messages.h" 10 #include "remoting/host/chromoting_messages.h"
11 #include "remoting/host/daemon_process.h" 11 #include "remoting/host/daemon_process.h"
12 #include "remoting/host/sas_injector.h"
12 #include "remoting/host/win/worker_process_launcher.h" 13 #include "remoting/host/win/worker_process_launcher.h"
13 #include "remoting/host/win/wts_console_monitor.h" 14 #include "remoting/host/win/wts_console_monitor.h"
14 #include "remoting/host/win/wts_session_process_delegate.h" 15 #include "remoting/host/win/wts_session_process_delegate.h"
15 16
16 using base::win::ScopedHandle; 17 using base::win::ScopedHandle;
17 18
18 namespace { 19 namespace {
19 20
20 const FilePath::CharType kDesktopBinaryName[] = 21 const FilePath::CharType kDesktopBinaryName[] =
21 FILE_PATH_LITERAL("remoting_desktop.exe"); 22 FILE_PATH_LITERAL("remoting_desktop.exe");
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 VLOG(1) << "IPC: daemon <- desktop (" << peer_pid << ")"; 66 VLOG(1) << "IPC: daemon <- desktop (" << peer_pid << ")";
66 } 67 }
67 68
68 bool DesktopSessionWin::OnMessageReceived(const IPC::Message& message) { 69 bool DesktopSessionWin::OnMessageReceived(const IPC::Message& message) {
69 DCHECK(main_task_runner_->BelongsToCurrentThread()); 70 DCHECK(main_task_runner_->BelongsToCurrentThread());
70 71
71 bool handled = true; 72 bool handled = true;
72 IPC_BEGIN_MESSAGE_MAP(DesktopSessionWin, message) 73 IPC_BEGIN_MESSAGE_MAP(DesktopSessionWin, message)
73 IPC_MESSAGE_HANDLER(ChromotingDesktopDaemonMsg_DesktopAttached, 74 IPC_MESSAGE_HANDLER(ChromotingDesktopDaemonMsg_DesktopAttached,
74 OnDesktopSessionAgentAttached) 75 OnDesktopSessionAgentAttached)
76 IPC_MESSAGE_HANDLER(ChromotingDesktopDaemonMsg_InjectSas,
77 OnInjectSas)
75 IPC_MESSAGE_UNHANDLED(handled = false) 78 IPC_MESSAGE_UNHANDLED(handled = false)
76 IPC_END_MESSAGE_MAP() 79 IPC_END_MESSAGE_MAP()
77 return handled; 80 return handled;
78 } 81 }
79 82
80 void DesktopSessionWin::OnPermanentError() { 83 void DesktopSessionWin::OnPermanentError() {
81 DCHECK(main_task_runner_->BelongsToCurrentThread()); 84 DCHECK(main_task_runner_->BelongsToCurrentThread());
82 85
83 launcher_.reset(); 86 launcher_.reset();
84 87
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 124
122 void DesktopSessionWin::OnDesktopSessionAgentAttached( 125 void DesktopSessionWin::OnDesktopSessionAgentAttached(
123 IPC::PlatformFileForTransit desktop_pipe) { 126 IPC::PlatformFileForTransit desktop_pipe) {
124 if (!daemon_process()->OnDesktopSessionAgentAttached(id(), 127 if (!daemon_process()->OnDesktopSessionAgentAttached(id(),
125 desktop_process_, 128 desktop_process_,
126 desktop_pipe)) { 129 desktop_pipe)) {
127 RestartDesktopProcess(FROM_HERE); 130 RestartDesktopProcess(FROM_HERE);
128 } 131 }
129 } 132 }
130 133
134 void DesktopSessionWin::OnInjectSas() {
135 DCHECK(main_task_runner_->BelongsToCurrentThread());
136
137 if (!launcher_)
138 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.
139
140 if (!sas_injector_)
141 sas_injector_ = SasInjector::Create();
142 if (!sas_injector_->InjectSas())
143 LOG(ERROR) << "Failed to inject Secure Attention Sequence.";
144 }
145
131 void DesktopSessionWin::RestartDesktopProcess( 146 void DesktopSessionWin::RestartDesktopProcess(
132 const tracked_objects::Location& location) { 147 const tracked_objects::Location& location) {
133 DCHECK(main_task_runner_->BelongsToCurrentThread()); 148 DCHECK(main_task_runner_->BelongsToCurrentThread());
134 149
135 launcher_->Send(new ChromotingDaemonDesktopMsg_Crash( 150 launcher_->Send(new ChromotingDaemonDesktopMsg_Crash(
136 location.function_name(), location.file_name(), location.line_number())); 151 location.function_name(), location.file_name(), location.line_number()));
137 } 152 }
138 153
139 } // namespace remoting 154 } // namespace remoting
OLDNEW
« remoting/host/desktop_session_agent_win.cc ('K') | « remoting/host/desktop_session_win.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698