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

Unified Diff: remoting/client/client_context.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/client_context.h ('k') | remoting/client/plugin/chromoting_instance.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/client_context.cc
diff --git a/remoting/client/client_context.cc b/remoting/client/client_context.cc
index 5f6d1399ae755264331167542b55c85108dda31b..4ad0faba196deabfb5fe4747de9f3ee2622d5899 100644
--- a/remoting/client/client_context.cc
+++ b/remoting/client/client_context.cc
@@ -4,16 +4,12 @@
#include "remoting/client/client_context.h"
-#include <string>
-
-#include "base/threading/thread.h"
-#include "remoting/jingle_glue/jingle_thread.h"
-
namespace remoting {
ClientContext::ClientContext()
: main_thread_("ChromotingClientMainThread"),
- decode_thread_("ChromotingClientDecodeThread") {
+ decode_thread_("ChromotingClientDecodeThread"),
+ network_thread_("ChromotingClientNetworkThread") {
}
ClientContext::~ClientContext() {
@@ -23,20 +19,17 @@ void ClientContext::Start() {
// Start all the threads.
main_thread_.Start();
decode_thread_.Start();
- jingle_thread_.Start();
+ network_thread_.StartWithOptions(
+ base::Thread::Options(MessageLoop::TYPE_IO, 0));
}
void ClientContext::Stop() {
// Stop all the threads.
- jingle_thread_.Stop();
+ network_thread_.Stop();
decode_thread_.Stop();
main_thread_.Stop();
}
-JingleThread* ClientContext::jingle_thread() {
- return &jingle_thread_;
-}
-
MessageLoop* ClientContext::main_message_loop() {
return main_thread_.message_loop();
}
@@ -46,7 +39,7 @@ MessageLoop* ClientContext::decode_message_loop() {
}
MessageLoop* ClientContext::network_message_loop() {
- return jingle_thread_.message_loop();
+ return network_thread_.message_loop();
}
} // namespace remoting
« no previous file with comments | « remoting/client/client_context.h ('k') | remoting/client/plugin/chromoting_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698