summaryrefslogtreecommitdiffstats
path: root/remoting/jingle_glue
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-26 04:20:12 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-26 04:20:12 +0000
commit8bb746373531af59d55280eda9f890cf26a0bbf0 (patch)
tree268bb2df8487157a4a8e7fe500f3628c9bb62cdb /remoting/jingle_glue
parent50a6843f28404fbabcfda2182b78a017b4cdc838 (diff)
downloadchromium_src-8bb746373531af59d55280eda9f890cf26a0bbf0.zip
chromium_src-8bb746373531af59d55280eda9f890cf26a0bbf0.tar.gz
chromium_src-8bb746373531af59d55280eda9f890cf26a0bbf0.tar.bz2
Roll libjingle 132:135
Review URL: https://chromiumcodereview.appspot.com/10209008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134065 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/jingle_glue')
-rw-r--r--remoting/jingle_glue/xmpp_socket_adapter.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/remoting/jingle_glue/xmpp_socket_adapter.h b/remoting/jingle_glue/xmpp_socket_adapter.h
index 953cbcc..8ee58d4 100644
--- a/remoting/jingle_glue/xmpp_socket_adapter.h
+++ b/remoting/jingle_glue/xmpp_socket_adapter.h
@@ -7,6 +7,8 @@
#include <string>
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
#include "third_party/libjingle/source/talk/base/asyncsocket.h"
#include "third_party/libjingle/source/talk/xmpp/asyncsocket.h"
#include "third_party/libjingle/source/talk/xmpp/xmppclientsettings.h"