diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-24 20:11:38 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-24 20:11:38 +0000 |
commit | bfea073cd44d981d663d0a83615d499a6b28bdaf (patch) | |
tree | a1138bffb3cc63cb21f0a113d2f6c46baac479f1 /remoting/client | |
parent | 2047ef4d68229d47cba8bf7f2e0465ab31f8b3ce (diff) | |
download | chromium_src-bfea073cd44d981d663d0a83615d499a6b28bdaf.zip chromium_src-bfea073cd44d981d663d0a83615d499a6b28bdaf.tar.gz chromium_src-bfea073cd44d981d663d0a83615d499a6b28bdaf.tar.bz2 |
Cleanup usage of JingleThread in the protocol code.
JingleThread was used in some places where it is not
necessary. Replace it with MessageLoop.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/7237013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90419 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client')
-rw-r--r-- | remoting/client/client_context.cc | 8 | ||||
-rw-r--r-- | remoting/client/client_context.h | 2 | ||||
-rw-r--r-- | remoting/client/plugin/chromoting_instance.cc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/remoting/client/client_context.cc b/remoting/client/client_context.cc index bf136c9..5f6d139 100644 --- a/remoting/client/client_context.cc +++ b/remoting/client/client_context.cc @@ -37,10 +37,6 @@ JingleThread* ClientContext::jingle_thread() { return &jingle_thread_; } -MessageLoop* ClientContext::jingle_message_loop() { - return jingle_thread_.message_loop(); -} - MessageLoop* ClientContext::main_message_loop() { return main_thread_.message_loop(); } @@ -49,4 +45,8 @@ MessageLoop* ClientContext::decode_message_loop() { return decode_thread_.message_loop(); } +MessageLoop* ClientContext::network_message_loop() { + return jingle_thread_.message_loop(); +} + } // namespace remoting diff --git a/remoting/client/client_context.h b/remoting/client/client_context.h index 9baa3af..38c6088 100644 --- a/remoting/client/client_context.h +++ b/remoting/client/client_context.h @@ -23,10 +23,10 @@ class ClientContext { void Stop(); JingleThread* jingle_thread(); - MessageLoop* jingle_message_loop(); MessageLoop* main_message_loop(); MessageLoop* decode_message_loop(); + MessageLoop* network_message_loop(); private: // A thread that handles Jingle network operations (used in diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc index 1a31af2..c1d7548 100644 --- a/remoting/client/plugin/chromoting_instance.cc +++ b/remoting/client/plugin/chromoting_instance.cc @@ -97,7 +97,7 @@ bool ChromotingInstance::Init(uint32_t argc, // Create the chromoting objects. host_connection_.reset(new protocol::ConnectionToHost( - context_.jingle_thread(), network_manager, socket_factory, + context_.network_message_loop(), network_manager, socket_factory, session_factory)); view_.reset(new PepperView(this, &context_)); view_proxy_ = new PepperViewProxy(this, view_.get()); |