Chromium Code Reviews| Index: remoting/host/wts_session_process_launcher_win.h |
| diff --git a/remoting/host/wts_session_process_launcher_win.h b/remoting/host/wts_session_process_launcher_win.h |
| index e0301f17966536c52f31557e361f8a6caa3b9c93..a0c3885a110dd71d8129575c81bbade05802439a 100644 |
| --- a/remoting/host/wts_session_process_launcher_win.h |
| +++ b/remoting/host/wts_session_process_launcher_win.h |
| @@ -18,11 +18,11 @@ |
| #include "base/win/scoped_handle.h" |
| #include "base/win/object_watcher.h" |
| #include "ipc/ipc_channel.h" |
| - |
| +#include "remoting/base/shutdownable.h" |
| #include "remoting/host/wts_console_observer_win.h" |
| namespace base { |
| -class MessageLoopProxy; |
| +class SingleThreadTaskRunner; |
| } // namespace base |
| namespace IPC { |
| @@ -39,7 +39,8 @@ class SasInjector; |
| class WtsConsoleMonitor; |
| class WtsSessionProcessLauncher |
| - : public base::win::ObjectWatcher::Delegate, |
| + : public Shutdownable, |
| + public base::win::ObjectWatcher::Delegate, |
| public IPC::Listener, |
| public WtsConsoleObserver { |
| public: |
| @@ -48,10 +49,11 @@ class WtsSessionProcessLauncher |
| // |monitor| should happen on |main_message_loop|. |ipc_message_loop| has |
| // to be an I/O message loop. |
| WtsSessionProcessLauncher( |
| + const Shutdownable::Callback& done, |
|
Sergey Ulanov
2012/07/30 19:46:22
done_callback?
alexeypa (please no reviews)
2012/07/30 20:41:43
I called it |stopped_callback|
|
| WtsConsoleMonitor* monitor, |
| const FilePath& host_binary, |
| - scoped_refptr<base::MessageLoopProxy> main_message_loop, |
| - scoped_refptr<base::MessageLoopProxy> ipc_message_loop); |
| + scoped_refptr<base::SingleThreadTaskRunner> main_message_loop, |
| + scoped_refptr<base::SingleThreadTaskRunner> ipc_message_loop); |
| virtual ~WtsSessionProcessLauncher(); |
| @@ -65,6 +67,10 @@ class WtsSessionProcessLauncher |
| virtual void OnSessionAttached(uint32 session_id) OVERRIDE; |
| virtual void OnSessionDetached() OVERRIDE; |
| + protected: |
| + // Shutdownable implementation. |
| + virtual void DoShutdown() OVERRIDE; |
| + |
| private: |
| // Attempts to launch the host process in the current console session. |
| // Schedules next launch attempt if creation of the process fails for any |
| @@ -88,10 +94,10 @@ class WtsSessionProcessLauncher |
| base::OneShotTimer<WtsSessionProcessLauncher> timer_; |
| // The main service message loop. |
| - scoped_refptr<base::MessageLoopProxy> main_message_loop_; |
| + scoped_refptr<base::SingleThreadTaskRunner> main_message_loop_; |
| // Message loop used by the IPC channel. |
| - scoped_refptr<base::MessageLoopProxy> ipc_message_loop_; |
| + scoped_refptr<base::SingleThreadTaskRunner> ipc_message_loop_; |
| // This pointer is used to unsubscribe from session attach and detach events. |
| WtsConsoleMonitor* monitor_; |