diff options
| author | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 06:18:28 +0000 |
|---|---|---|
| committer | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 06:18:28 +0000 |
| commit | 9c871e2e2466d527cbe02039b8420208dbb7d780 (patch) | |
| tree | a0ed2a18a91a63df8ed514e76af9ff33373f8dcf /jingle/glue | |
| parent | dcd4fc4839b4c314a6c3f263dd073122ffb480c2 (diff) | |
| download | chromium_src-9c871e2e2466d527cbe02039b8420208dbb7d780.zip chromium_src-9c871e2e2466d527cbe02039b8420208dbb7d780.tar.gz chromium_src-9c871e2e2466d527cbe02039b8420208dbb7d780.tar.bz2 | |
Roll libjingle to r108:
* Add app/webrtc.
* Add examples/peerconnection.
* Bug fixes.
Roll webrtc to 1311.
BUG=110255
TEST=build and unit tests
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=118031
Review URL: http://codereview.chromium.org/9174012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118254 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/glue')
| -rw-r--r-- | jingle/glue/thread_wrapper.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/jingle/glue/thread_wrapper.cc b/jingle/glue/thread_wrapper.cc index f92621f..10be381 100644 --- a/jingle/glue/thread_wrapper.cc +++ b/jingle/glue/thread_wrapper.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -49,7 +49,8 @@ JingleThreadWrapper::JingleThreadWrapper(MessageLoop* message_loop) 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 @@ void JingleThreadWrapper::WillDestroyCurrentMessageLoop() { 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; |