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

Unified Diff: remoting/host/desktop_session_win.cc

Issue 12545006: The worker process launcher can now ask the worker to crash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months 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
Index: remoting/host/desktop_session_win.cc
diff --git a/remoting/host/desktop_session_win.cc b/remoting/host/desktop_session_win.cc
index 50d41c87c2952a07784e371c75ca5ba71849054b..1dbc695807eb91b8e2134d472d7c7ed64f31883a 100644
--- a/remoting/host/desktop_session_win.cc
+++ b/remoting/host/desktop_session_win.cc
@@ -64,7 +64,7 @@ void DesktopSessionWin::OnChannelConnected(int32 peer_pid) {
// from the desktop process.
desktop_process_.Set(OpenProcess(PROCESS_DUP_HANDLE, false, peer_pid));
if (!desktop_process_.IsValid()) {
- RestartDesktopProcess(FROM_HERE);
+ CrashDesktopProcess(FROM_HERE);
return;
}
@@ -85,7 +85,7 @@ bool DesktopSessionWin::OnMessageReceived(const IPC::Message& message) {
if (!handled) {
LOG(ERROR) << "Received unexpected IPC type: " << message.type();
- RestartDesktopProcess(FROM_HERE);
+ CrashDesktopProcess(FROM_HERE);
}
return handled;
@@ -140,7 +140,7 @@ void DesktopSessionWin::OnDesktopSessionAgentAttached(
if (!daemon_process()->OnDesktopSessionAgentAttached(id(),
desktop_process_,
desktop_pipe)) {
- RestartDesktopProcess(FROM_HERE);
+ CrashDesktopProcess(FROM_HERE);
}
}
@@ -158,12 +158,11 @@ void DesktopSessionWin::OnInjectSas() {
LOG(ERROR) << "Failed to inject Secure Attention Sequence.";
}
-void DesktopSessionWin::RestartDesktopProcess(
+void DesktopSessionWin::CrashDesktopProcess(
const tracked_objects::Location& location) {
DCHECK(main_task_runner_->BelongsToCurrentThread());
- launcher_->Send(new ChromotingDaemonDesktopMsg_Crash(
- location.function_name(), location.file_name(), location.line_number()));
+ launcher_->Crash(location);
}
} // namespace remoting

Powered by Google App Engine
This is Rietveld 408576698