Index: remoting/host/host_service_win.h |
diff --git a/remoting/host/host_service_win.h b/remoting/host/host_service_win.h |
index e448119936efe65c70a089cbc9fa5f6f79b2ea43..126d3740622022b8a383710b6aa2e0990ed3b391 100644 |
--- a/remoting/host/host_service_win.h |
+++ b/remoting/host/host_service_win.h |
@@ -22,9 +22,16 @@ class SingleThreadTaskRunner; |
namespace remoting { |
+#if defined(REMOTING_MULTI_PROCESS) |
+class DaemonProcess; |
+#endif // defined(REMOTING_MULTI_PROCESS) |
+ |
class Shutdownable; |
class WtsConsoleObserver; |
+ |
+#if !defined(REMOTING_MULTI_PROCESS) |
class WtsSessionProcessLauncher; |
+#endif // !defined(REMOTING_MULTI_PROCESS) |
class HostService : public WtsConsoleMonitor { |
public: |
@@ -45,7 +52,7 @@ class HostService : public WtsConsoleMonitor { |
HostService(); |
~HostService(); |
- void OnLauncherShutdown(Shutdownable* launcher); |
+ void OnShutdownableStopped(Shutdownable* launcher); |
// Notifies the service of changes in session state. |
void OnSessionChange(); |
@@ -85,7 +92,11 @@ class HostService : public WtsConsoleMonitor { |
// to the physical console. |
ObserverList<WtsConsoleObserver> console_observers_; |
- scoped_ptr<WtsSessionProcessLauncher> launcher_; |
+#if defined(REMOTING_MULTI_PROCESS) |
+ scoped_ptr<DaemonProcess> child_; |
+#else |
+ scoped_ptr<WtsSessionProcessLauncher> child_; |
Sergey Ulanov
2012/07/30 19:50:04
This is used only to call Shutdown(), so maybe mak
alexeypa (please no reviews)
2012/07/30 21:50:03
Done.
|
+#endif // defined(REMOTING_MULTI_PROCESS) |
// Service message loop. |
scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_; |