Chromium Code Reviews| Index: remoting/host/chromoting_host_context.cc |
| diff --git a/remoting/host/chromoting_host_context.cc b/remoting/host/chromoting_host_context.cc |
| index 480de732922a9282de5dac6a984b884150f6f2ec..2f58da15385ddb0283dc2005f1f8820bcc53c086 100644 |
| --- a/remoting/host/chromoting_host_context.cc |
| +++ b/remoting/host/chromoting_host_context.cc |
| @@ -8,12 +8,13 @@ |
| #include "base/bind.h" |
| #include "base/threading/thread.h" |
| +#include "remoting/base//auto_message_loop.h" |
| #include "remoting/host/url_request_context.h" |
| namespace remoting { |
| ChromotingHostContext::ChromotingHostContext( |
| - scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) |
| + base::SingleThreadTaskRunner* ui_task_runner) |
| : network_thread_("ChromotingNetworkThread"), |
| capture_thread_("ChromotingCaptureThread"), |
| encode_thread_("ChromotingEncodeThread"), |
| @@ -36,6 +37,22 @@ bool ChromotingHostContext::Start() { |
| if (!started) |
| return false; |
| + network_task_runner_ = |
| + new AutoMessageLoop(ui_task_runner_, network_thread_.message_loop_proxy(), |
| + base::Closure()); |
|
Wez
2012/08/28 17:34:53
If you're going to pass a null |stop_callback|, wh
alexeypa (please no reviews)
2012/08/28 19:18:51
AutoMessageLoop will CHECK() if the message loop w
Wez
2012/08/30 18:20:12
Please add a one-line comment to explain that that
alexeypa (please no reviews)
2012/08/30 22:08:07
Done.
|
| + capture_task_runner_ = |
| + new AutoMessageLoop(ui_task_runner_, capture_thread_.message_loop_proxy(), |
| + base::Closure()); |
| + encode_task_runner_ = |
| + new AutoMessageLoop(ui_task_runner_, encode_thread_.message_loop_proxy(), |
| + base::Closure()); |
| + desktop_task_runner_ = |
| + new AutoMessageLoop(ui_task_runner_, desktop_thread_.message_loop_proxy(), |
| + base::Closure()); |
| + file_task_runner_ = |
| + new AutoMessageLoop(ui_task_runner_, file_thread_.message_loop_proxy(), |
| + base::Closure()); |
| + |
| url_request_context_getter_ = new URLRequestContextGetter( |
| ui_task_runner(), network_task_runner(), |
| static_cast<MessageLoopForIO*>(file_thread_.message_loop())); |
| @@ -43,19 +60,19 @@ bool ChromotingHostContext::Start() { |
| } |
| base::SingleThreadTaskRunner* ChromotingHostContext::capture_task_runner() { |
| - return capture_thread_.message_loop_proxy(); |
| + return capture_task_runner_; |
| } |
| base::SingleThreadTaskRunner* ChromotingHostContext::encode_task_runner() { |
| - return encode_thread_.message_loop_proxy(); |
| + return encode_task_runner_; |
| } |
| base::SingleThreadTaskRunner* ChromotingHostContext::network_task_runner() { |
| - return network_thread_.message_loop_proxy(); |
| + return network_task_runner_; |
| } |
| base::SingleThreadTaskRunner* ChromotingHostContext::desktop_task_runner() { |
| - return desktop_thread_.message_loop_proxy(); |
| + return desktop_task_runner_; |
| } |
| base::SingleThreadTaskRunner* ChromotingHostContext::ui_task_runner() { |
| @@ -63,7 +80,7 @@ base::SingleThreadTaskRunner* ChromotingHostContext::ui_task_runner() { |
| } |
| base::SingleThreadTaskRunner* ChromotingHostContext::file_task_runner() { |
| - return file_thread_.message_loop_proxy(); |
| + return file_task_runner_; |
| } |
| const scoped_refptr<net::URLRequestContextGetter>& |