• Home
  • History
  • Annotate
  • only in /external/chromium_org/jingle/glue/
History log of /external/chromium_org/jingle/glue/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
1320f92c476a1ad9d19dba2a48c72b75566198e9 30-Sep-2014 Primiano Tucci <primiano@google.com> Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
ogging_unittest.cc
roxy_resolving_client_socket.cc
hread_wrapper.cc
03b57e008b61dfcb1fbad3aea950ae0e001748b0 28-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 291560

This commit was generated by merge_to_master.py.

Change-Id: Ic58269055810d51286b4109e59b90b6856887a30
roxy_resolving_client_socket.cc
5f1c94371a64b3196d4be9466099bb892df9b88e 12-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854
EPS
hannel_socket_adapter.cc
hannel_socket_adapter.h
hannel_socket_adapter_unittest.cc
hrome_async_socket.cc
hrome_async_socket.h
hrome_async_socket_unittest.cc
ake_network_manager.cc
ake_network_manager.h
ake_socket_factory.cc
ake_socket_factory.h
ingle_glue_mock_objects.h
ogging_unittest.cc
ock_task.cc
ock_task.h
roxy_resolving_client_socket.cc
ask_pump.h
ask_pump_unittest.cc
hread_wrapper.cc
hread_wrapper.h
hread_wrapper_unittest.cc
tils.cc
tils.h
mpp_client_socket_factory.cc
116680a4aac90f2aa7413d9095a592090648e557 21-Jul-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
hrome_async_socket_unittest.cc
roxy_resolving_client_socket.cc
hread_wrapper_unittest.cc
tils.cc
cedac228d2dd51db4b79ea1e72c7f249408ee061 03-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
roxy_resolving_client_socket.cc
c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c 10-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
hannel_socket_adapter.cc
hannel_socket_adapter.h
ake_ssl_client_socket.cc
ake_ssl_client_socket.h
ake_ssl_client_socket_unittest.cc
roxy_resolving_client_socket.cc
roxy_resolving_client_socket.h
seudotcp_adapter.cc
seudotcp_adapter.h
seudotcp_adapter_unittest.cc
e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d 03-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
roxy_resolving_client_socket.cc
5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 21-Feb-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
hannel_socket_adapter.cc
hannel_socket_adapter.h
hannel_socket_adapter_unittest.cc
ake_socket_factory.cc
ake_socket_factory.h
roxy_resolving_client_socket.cc
f2477e01787aa58f445919b809d89e252beef54f 28-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
hrome_async_socket.cc
hrome_async_socket.h
roxy_resolving_client_socket.h
ask_pump.cc
ask_pump.h
hread_wrapper.cc
hread_wrapper.h
4e180b6a0b4720a9b8e9e959a882386f690f08ff 18-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
hannel_socket_adapter_unittest.cc
68043e1e95eeb07d5cae7aca370b26518b0867d6 26-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 225410

This commit was generated by merge_to_master.py.

Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
hannel_socket_adapter.cc
hannel_socket_adapter_unittest.cc
ake_socket_factory.cc
ake_socket_factory.h
seudotcp_adapter_unittest.cc
58537e28ecd584eab876aee8be7156509866d23a 12-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 222756

This commit was generated by merge_to_master.py.

Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
ogging_unittest.cc
424c4d7b64af9d0d8fd9624f381f469654d5e3d2 30-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r220549

This commit was generated by merge_to_master.py.

Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
hannel_socket_adapter_unittest.cc
hread_wrapper.cc
3551c9c881056c480085172ff9840cab31610854 23-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r219274

This commit was generated by merge_to_master.py.

Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
hrome_async_socket.cc
hrome_async_socket_unittest.cc
ake_ssl_client_socket.cc
ake_ssl_client_socket.h
ake_ssl_client_socket_unittest.cc
esolving_client_socket_factory.h
mpp_client_socket_factory.cc
mpp_client_socket_factory.h
c2db58bd994c04d98e4ee2cd7565b71548655fe3 14-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r217147

This commit was generated by merge_to_master.py.

Change-Id: Ifa927da4997e49ab95edfc5def5ee5615a76b1be
hannel_socket_adapter_unittest.cc
9ab5563a3196760eb381d102cbb2bc0f7abc6a50 18-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212225

This commit was generated by merge_to_master.py.

Change-Id: I9b658b6bade7aff6166611a04fb26f4bcf0ca77c
hannel_socket_adapter.cc
hannel_socket_adapter_unittest.cc
hrome_async_socket.cc
hrome_async_socket_unittest.cc
ake_network_manager.cc
ake_socket_factory.cc
ake_ssl_client_socket_unittest.cc
roxy_resolving_client_socket_unittest.cc
ask_pump.cc
ask_pump_unittest.cc
hread_wrapper.h
hread_wrapper_unittest.cc
7dbb3d5cf0c15f500944d211057644d6a2f37371 17-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212014

This commit was generated by merge_to_master.py.

Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
roxy_resolving_client_socket.h
eb525c5499e34cc9c4b825d6d9e75bb07cc06ace 10-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r210036

This commit was generated by merge_to_master.py.

Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
ogging_unittest.cc
seudotcp_adapter.cc
seudotcp_adapter.h
tils.cc
7d4cd473f85ac64c3747c96c277f9e506a0d2246 19-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r207203

This commit was generated by merge_to_master.py.

Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
hrome_async_socket_unittest.cc
roxy_resolving_client_socket.cc
tils.cc
tils.h
868fa2fe829687343ffae624259930155e16dbd8 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
hannel_socket_adapter.cc
hannel_socket_adapter_unittest.cc
ake_socket_factory.cc
ake_ssl_client_socket.cc
ake_ssl_client_socket_unittest.cc
roxy_resolving_client_socket.cc
seudotcp_adapter.cc
seudotcp_adapter_unittest.cc
90dce4d38c5ff5333bea97d859d4e484e27edf0c 29-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r202854

This commit was generated by merge_to_master.py.

Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
roxy_resolving_client_socket.cc
b2df76ea8fec9e32f6f3718986dba0d95315b29c 13-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r199464

This commit was generated by merge_to_master.py.

Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9
ake_socket_factory.cc
ake_socket_factory.h
c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d 09-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I951118a03836157090561764dd2627f0add8118f
hannel_socket_adapter.cc
hannel_socket_adapter.h
hannel_socket_adapter_unittest.cc
hrome_async_socket.cc
hrome_async_socket_unittest.cc
ake_network_manager.cc
ake_socket_factory.cc
ake_socket_factory.h
ake_ssl_client_socket.cc
ake_ssl_client_socket.h
ake_ssl_client_socket_unittest.cc
roxy_resolving_client_socket.cc
roxy_resolving_client_socket.h
roxy_resolving_client_socket_unittest.cc
seudotcp_adapter.cc
seudotcp_adapter.h
seudotcp_adapter_unittest.cc
ask_pump.cc
ask_pump_unittest.cc
hread_wrapper.cc
hread_wrapper.h
hread_wrapper_unittest.cc
2a99a7e74a7f215066514fe81d2bfa6639d9eddd 28-Mar-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
hannel_socket_adapter_unittest.cc
hrome_async_socket.cc
hrome_async_socket_unittest.cc
ogging_unittest.cc
roxy_resolving_client_socket.h
roxy_resolving_client_socket_unittest.cc
seudotcp_adapter_unittest.cc
ask_pump_unittest.cc
hread_wrapper_unittest.cc
tils.cc
mpp_client_socket_factory.h
5821806d5e7f356e8fa4b058a389a808ea183019 14-Nov-2012 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab
EPS
hannel_socket_adapter.cc
hannel_socket_adapter.h
hannel_socket_adapter_unittest.cc
hrome_async_socket.cc
hrome_async_socket.h
hrome_async_socket_unittest.cc
ake_network_manager.cc
ake_network_manager.h
ake_socket_factory.cc
ake_socket_factory.h
ake_ssl_client_socket.cc
ake_ssl_client_socket.h
ake_ssl_client_socket_unittest.cc
ingle_glue_mock_objects.cc
ingle_glue_mock_objects.h
ogging_unittest.cc
ock_task.cc
ock_task.h
roxy_resolving_client_socket.cc
roxy_resolving_client_socket.h
roxy_resolving_client_socket_unittest.cc
seudotcp_adapter.cc
seudotcp_adapter.h
seudotcp_adapter_unittest.cc
esolving_client_socket_factory.h
ask_pump.cc
ask_pump.h
ask_pump_unittest.cc
hread_wrapper.cc
hread_wrapper.h
hread_wrapper_unittest.cc
tils.cc
tils.h
mpp_client_socket_factory.cc
mpp_client_socket_factory.h