diff options
| author | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 17:43:11 +0000 |
|---|---|---|
| committer | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 17:43:11 +0000 |
| commit | 3c616af847bf840951a7f1821d02321de819e028 (patch) | |
| tree | 8a5042813e97c38934bffecf9d0df4492f23c50b /remoting/jingle_glue | |
| parent | fea38fc937f7b837c63a71540913e6ef98e794a6 (diff) | |
| download | chromium_src-3c616af847bf840951a7f1821d02321de819e028.zip chromium_src-3c616af847bf840951a7f1821d02321de819e028.tar.gz chromium_src-3c616af847bf840951a7f1821d02321de819e028.tar.bz2 | |
Update libjingle to 153.
Remove the overrides for thread and messagequeue.
Review URL: https://chromiumcodereview.appspot.com/10534122
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141908 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/jingle_glue')
| -rw-r--r-- | remoting/jingle_glue/jingle_thread.h | 4 | ||||
| -rw-r--r-- | remoting/jingle_glue/xmpp_socket_adapter.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/remoting/jingle_glue/jingle_thread.h b/remoting/jingle_glue/jingle_thread.h index 7c3aba0..2c5422e 100644 --- a/remoting/jingle_glue/jingle_thread.h +++ b/remoting/jingle_glue/jingle_thread.h @@ -8,9 +8,9 @@ #include "base/message_loop.h" #include "base/tracked_objects.h" #include "base/synchronization/waitable_event.h" -#include "third_party/libjingle/overrides/talk/base/messagequeue.h" -#include "third_party/libjingle/overrides/talk/base/thread.h" +#include "third_party/libjingle/source/talk/base/messagequeue.h" #include "third_party/libjingle/source/talk/base/taskrunner.h" +#include "third_party/libjingle/source/talk/base/thread.h" namespace base { class MessageLoopProxy; diff --git a/remoting/jingle_glue/xmpp_socket_adapter.cc b/remoting/jingle_glue/xmpp_socket_adapter.cc index 611d70f..de66c5f 100644 --- a/remoting/jingle_glue/xmpp_socket_adapter.cc +++ b/remoting/jingle_glue/xmpp_socket_adapter.cc @@ -9,12 +9,12 @@ #include "base/logging.h" #include "remoting/jingle_glue/ssl_adapter.h" -#include "third_party/libjingle/overrides/talk/base/thread.h" #include "third_party/libjingle/source/talk/base/byteorder.h" #include "third_party/libjingle/source/talk/base/common.h" #include "third_party/libjingle/source/talk/base/firewallsocketserver.h" #include "third_party/libjingle/source/talk/base/socketadapters.h" #include "third_party/libjingle/source/talk/base/ssladapter.h" +#include "third_party/libjingle/source/talk/base/thread.h" #include "third_party/libjingle/source/talk/xmpp/xmppengine.h" namespace remoting { |