Introducing the DaemonProcess class that will implements core of the daemon process functionality. …

remoting/host/host_service_win.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef REMOTING_HOST_HOST_SERVICE_WIN_H_
 #define REMOTING_HOST_HOST_SERVICE_WIN_H_
 
 #include <windows.h>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
 #include "base/observer_list.h"
 #include "base/synchronization/waitable_event.h"
 #include "remoting/host/wts_console_monitor_win.h"
 
 class CommandLine;
 class MessageLoop;
 
 namespace base {
 class SingleThreadTaskRunner;
 }  // namespace base
 
 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:
   static HostService* GetInstance();
 
   // This function parses the command line and selects the action routine.
   bool InitWithCommandLine(const CommandLine* command_line);
 
   // Invoke the choosen action routine.
   int Run();
 
   // WtsConsoleMonitor implementation
   virtual void AddWtsConsoleObserver(WtsConsoleObserver* observer) OVERRIDE;
   virtual void RemoveWtsConsoleObserver(
                    WtsConsoleObserver* observer) OVERRIDE;
 
  private:
   HostService();
   ~HostService();
 
-  void OnLauncherShutdown(Shutdownable* launcher);
+  void OnShutdownableStopped(Shutdownable* launcher);
 
   // Notifies the service of changes in session state.
   void OnSessionChange();
 
   // This is a common entry point to the main service loop called by both
   // RunAsService() and RunInConsole().
   void RunMessageLoop(MessageLoop* message_loop);
 
   // This function handshakes with the service control manager and starts
   // the service.
@@ skipping 19 matching lines @@
                                                         WPARAM wparam,
                                                         LPARAM lparam);
 
   // Current physical console session id.
   uint32 console_session_id_;
 
   // The list of observers receiving notifications about any session attached
   // 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 make it scoped_ptr<Shutdownable>
so that it's the same type in both cases?

[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_;
 
   // The action routine to be executed.
   int (HostService::*run_routine_)();
 
   // The service name.
   std::wstring service_name_;
 
   // The service status handle.
   SERVICE_STATUS_HANDLE service_status_handle_;
 
   // A waitable event that is used to wait until the service is stopped.
   base::WaitableEvent stopped_event_;
 
   // Singleton.
   friend struct DefaultSingletonTraits<HostService>;
 
   DISALLOW_COPY_AND_ASSIGN(HostService);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_HOST_SERVICE_WIN_H_