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

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: 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/daemon_process_win.cc
diff --git a/remoting/host/daemon_process_win.cc b/remoting/host/daemon_process_win.cc
index 9ee9f0b5ea6a8686eafe6657c36818ba944a2ca3..c392456ed3dc0e3b3dd0f286fd5e3cdd3e93fd65 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"
@@ -65,6 +66,8 @@ class DaemonProcessWin : public DaemonProcess {
// DaemonProcess implementation.
virtual scoped_ptr<DesktopSession> DoCreateDesktopSession(
int terminal_id) OVERRIDE;
+ virtual void DoCrashNetworkProcess(
+ const tracked_objects::Location& location) OVERRIDE;
virtual void LaunchNetworkProcess() OVERRIDE;
private:
@@ -149,6 +152,13 @@ scoped_ptr<DesktopSession> DaemonProcessWin::DoCreateDesktopSession(
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_);

Powered by Google App Engine
This is Rietveld 408576698