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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: jingle/glue/thread_wrapper.cc

Issue 9174012: Roll libjingle to r108. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 8 years, 11 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 | « content/renderer/media/peer_connection_handler_unittest.cc ('k') | third_party/libjingle/README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: jingle/glue/thread_wrapper.cc
===================================================================
--- jingle/glue/thread_wrapper.cc (revision 117833)
+++ jingle/glue/thread_wrapper.cc (working copy)
@@ -49,7 +49,8 @@
pending_send_event_(true, false) {
DCHECK_EQ(message_loop_, MessageLoop::current());
- talk_base::ThreadManager::SetCurrent(this);
+ talk_base::ThreadManager::Instance()->UnwrapCurrentThread();
+ talk_base::ThreadManager::Instance()->SetCurrentThread(this);
talk_base::MessageQueueManager::Instance()->Add(this);
message_loop_->AddDestructionObserver(this);
@@ -63,7 +64,7 @@
DCHECK_EQ(talk_base::Thread::Current(), current());
UnwrapCurrent();
g_jingle_thread_wrapper.Get().Set(NULL);
- talk_base::ThreadManager::SetCurrent(NULL);
+ talk_base::ThreadManager::Instance()->SetCurrentThread(NULL);
talk_base::MessageQueueManager::Instance()->Remove(this);
message_loop_->RemoveDestructionObserver(this);
delete this;
« no previous file with comments | « content/renderer/media/peer_connection_handler_unittest.cc ('k') | third_party/libjingle/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698