summaryrefslogtreecommitdiffstats
path: root/remoting/client
diff options
context:
space:
mode:
Diffstat (limited to 'remoting/client')
-rw-r--r--remoting/client/client_context.cc8
-rw-r--r--remoting/client/client_context.h2
-rw-r--r--remoting/client/plugin/chromoting_instance.cc2
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());