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

Unified Diff: remoting/host/daemon_process_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: rebased 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
« no previous file with comments | « remoting/host/daemon_process_unittest.cc ('k') | remoting/host/desktop_process.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/daemon_process_win.cc
diff --git a/remoting/host/daemon_process_win.cc b/remoting/host/daemon_process_win.cc
index 6c812004f2bf9683f2a46d5fedbb7b8b5d7c3c2a..1a042d5ecb1629cb6187ce1ce9930620e6c1762b 100644
--- a/remoting/host/daemon_process_win.cc
+++ b/remoting/host/daemon_process_win.cc
@@ -7,6 +7,7 @@
#include "base/base_switches.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/location.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
@@ -67,6 +68,8 @@ class DaemonProcessWin : public DaemonProcess {
int terminal_id,
const DesktopSessionParams& params,
bool virtual_terminal) OVERRIDE;
+ virtual void DoCrashNetworkProcess(
+ const tracked_objects::Location& location) OVERRIDE;
virtual void LaunchNetworkProcess() OVERRIDE;
private:
@@ -153,6 +156,13 @@ scoped_ptr<DesktopSession> DaemonProcessWin::DoCreateDesktopSession(
params, virtual_terminal, HostService::GetInstance()));
}
+void DaemonProcessWin::DoCrashNetworkProcess(
+ const tracked_objects::Location& location) {
+ DCHECK(caller_task_runner()->BelongsToCurrentThread());
+
+ network_launcher_->Crash(location);
+}
+
void DaemonProcessWin::LaunchNetworkProcess() {
DCHECK(caller_task_runner()->BelongsToCurrentThread());
DCHECK(!network_launcher_);
« no previous file with comments | « remoting/host/daemon_process_unittest.cc ('k') | remoting/host/desktop_process.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698