Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(91)

Unified Diff: remoting/client/chromoting_client.cc

Issue 7575016: Don't use JingleThread in the client plugin. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update DEPS Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/client/DEPS ('k') | remoting/client/client_context.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/chromoting_client.cc
diff --git a/remoting/client/chromoting_client.cc b/remoting/client/chromoting_client.cc
index 130e3987eedf0c62a329f46d7c9e7e50a5264ab9..48b8a21ec3d289c91e1657ffd584fa22cc3648b8 100644
--- a/remoting/client/chromoting_client.cc
+++ b/remoting/client/chromoting_client.cc
@@ -6,6 +6,7 @@
#include "base/bind.h"
#include "base/message_loop.h"
+#include "jingle/glue/thread_wrapper.h"
#include "remoting/base/tracer.h"
#include "remoting/client/chromoting_view.h"
#include "remoting/client/client_context.h"
@@ -46,6 +47,8 @@ void ChromotingClient::Start(scoped_refptr<XmppProxy> xmpp_proxy) {
return;
}
+ jingle_glue::JingleThreadWrapper::EnsureForCurrentThread();
+
connection_->Connect(xmpp_proxy, config_.local_jid, config_.host_jid,
config_.host_public_key, config_.access_code,
this, this, this);
@@ -180,7 +183,7 @@ void ChromotingClient::OnConnectionFailed(protocol::ConnectionToHost* conn) {
}
MessageLoop* ChromotingClient::message_loop() {
- return context_->jingle_thread()->message_loop();
+ return context_->network_message_loop();
}
void ChromotingClient::SetConnectionState(ConnectionState s) {
« no previous file with comments | « remoting/client/DEPS ('k') | remoting/client/client_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698