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 603a8e9b9d9d1cadadcd4d18b0a459c2fde147f7..18c293f6f660c5457983ecbb6f5befe69aa2633d 100644 |
| --- a/remoting/host/chromoting_host_context.cc |
| +++ b/remoting/host/chromoting_host_context.cc |
| @@ -7,11 +7,21 @@ |
| #include <string> |
| #include "base/bind.h" |
| +#include "base/synchronization/waitable_event.h" |
| #include "base/threading/thread.h" |
| #include "remoting/jingle_glue/jingle_thread.h" |
| namespace remoting { |
| +namespace { |
| +void InitializeMessageLoopProxy( |
| + scoped_refptr<base::MessageLoopProxy>* proxy, |
| + base::WaitableEvent* done) { |
| + *proxy = base::MessageLoopProxy::CreateForCurrentThread(); |
| + done->Signal(); |
| +} |
| +} // namespace |
| + |
| ChromotingHostContext::ChromotingHostContext() |
| : main_thread_("ChromotingMainThread"), |
| encode_thread_("ChromotingEncodeThread"), |
| @@ -27,6 +37,12 @@ void ChromotingHostContext::Start() { |
| encode_thread_.Start(); |
| jingle_thread_.Start(); |
| desktop_thread_.Start(); |
| + |
| + // Initialize |network_message_loop_| on the network thread. |
| + base::WaitableEvent proxy_event(true, false); |
| + jingle_thread_.message_loop()->PostTask(FROM_HERE, base::Bind( |
| + &InitializeMessageLoopProxy, &network_message_loop_, &proxy_event)); |
| + proxy_event.Wait(); |
|
Wez
2011/08/12 21:11:20
Again, use message_loop_proxy() here?
Sergey Ulanov
2011/08/12 21:24:18
Added message_loop_proxy() in JingleThread.
|
| } |
| void ChromotingHostContext::Stop() { |
| @@ -49,8 +65,8 @@ MessageLoop* ChromotingHostContext::encode_message_loop() { |
| return encode_thread_.message_loop(); |
| } |
| -MessageLoop* ChromotingHostContext::network_message_loop() { |
| - return jingle_thread_.message_loop(); |
| +base::MessageLoopProxy* ChromotingHostContext::network_message_loop() { |
| + return network_message_loop_; |
| } |
| MessageLoop* ChromotingHostContext::desktop_message_loop() { |