diff options
| author | pbos <pbos@chromium.org> | 2015-10-07 07:27:19 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-07 14:28:09 +0000 |
| commit | 10b0fb04758034c452cea80c8298a2379a7b4eac (patch) | |
| tree | c9691fd4c2a53f050c8365373e826d85fb3f28f8 /remoting | |
| parent | c68e20f51052269ba633d6c524a239bf961b5d31 (diff) | |
| download | chromium_src-10b0fb04758034c452cea80c8298a2379a7b4eac.zip chromium_src-10b0fb04758034c452cea80c8298a2379a7b4eac.tar.gz chromium_src-10b0fb04758034c452cea80c8298a2379a7b4eac.tar.bz2 | |
Roll WebRTC 10183:10197, Libjingle 10176:10196
Also adds some #include "base/basictypes.h" to remoting/ (uses uint16).
WebRTC 10183:10197
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/e2c433c..dd1d405
Libjingle 10176:10196
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/bfcf08f..cb124ee
BUG=webrtc:5024
R=henrika@chromium.org
TBR=sergeyu@chromium.org, mcasas@chromium.org
Review URL: https://codereview.chromium.org/1392713003
Cr-Commit-Position: refs/heads/master@{#352835}
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/client/plugin/pepper_packet_socket_factory.h | 1 | ||||
| -rw-r--r-- | remoting/protocol/chromium_socket_factory.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/remoting/client/plugin/pepper_packet_socket_factory.h b/remoting/client/plugin/pepper_packet_socket_factory.h index 12dc128..d355ff3 100644 --- a/remoting/client/plugin/pepper_packet_socket_factory.h +++ b/remoting/client/plugin/pepper_packet_socket_factory.h @@ -5,6 +5,7 @@ #ifndef REMOTING_CLIENT_PLUGIN_PEPPER_PACKET_SOCKET_FACTORY_H_ #define REMOTING_CLIENT_PLUGIN_PEPPER_PACKET_SOCKET_FACTORY_H_ +#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "ppapi/cpp/instance_handle.h" diff --git a/remoting/protocol/chromium_socket_factory.h b/remoting/protocol/chromium_socket_factory.h index b0ebd21..6bf7696 100644 --- a/remoting/protocol/chromium_socket_factory.h +++ b/remoting/protocol/chromium_socket_factory.h @@ -5,6 +5,7 @@ #ifndef REMOTING_PROTOCOL_CHROMIUM_SOCKET_FACTORY_H_ #define REMOTING_PROTOCOL_CHROMIUM_SOCKET_FACTORY_H_ +#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "third_party/webrtc/p2p/base/packetsocketfactory.h" |