| 78901d17b47ef1f8d6d0a89eaf37f9523ba1de85 |
08-Dec-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 39.0.2171.95
This commit was generated by merge_to_master.py.
Change-Id: I6695b44b7c48580907460fb1a183c166e6ab505f
ingle_glue.target.darwin-mips64.mk
ingle_glue.target.linux-mips64.mk
|
| 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
UILD.gn
EPS
lue/logging_unittest.cc
lue/proxy_resolving_client_socket.cc
lue/thread_wrapper.cc
ingle_glue.target.darwin-arm.mk
ingle_glue.target.darwin-arm64.mk
ingle_glue.target.darwin-mips.mk
ingle_glue.target.darwin-x86.mk
ingle_glue.target.darwin-x86_64.mk
ingle_glue.target.linux-arm.mk
ingle_glue.target.linux-arm64.mk
ingle_glue.target.linux-mips.mk
ingle_glue.target.linux-x86.mk
ingle_glue.target.linux-x86_64.mk
otifier/DEPS
otifier/communicator/login.cc
otifier/communicator/single_login_attempt.cc
otifier/communicator/single_login_attempt_unittest.cc
otifier/listener/push_notifications_listen_task.cc
otifier/listener/push_notifications_send_update_task.cc
otifier/listener/push_notifications_subscribe_task.cc
otifier/listener/push_notifications_subscribe_task.h
otifier/listener/send_ping_task.cc
otifier/listener/xml_element_util.cc
otifier/listener/xml_element_util_unittest.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
lue/proxy_resolving_client_socket.cc
|
| 6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 |
19-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 290040
This commit was generated by merge_to_master.py.
Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
UILD.gn
RESUBMIT.py
ingle_glue.target.darwin-arm.mk
ingle_glue.target.darwin-arm64.mk
ingle_glue.target.darwin-mips.mk
ingle_glue.target.darwin-x86.mk
ingle_glue.target.darwin-x86_64.mk
ingle_glue.target.linux-arm.mk
ingle_glue.target.linux-arm64.mk
ingle_glue.target.linux-mips.mk
ingle_glue.target.linux-x86.mk
ingle_glue.target.linux-x86_64.mk
|
| 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
UILD.gn
RESUBMIT.py
lue/DEPS
lue/channel_socket_adapter.cc
lue/channel_socket_adapter.h
lue/channel_socket_adapter_unittest.cc
lue/chrome_async_socket.cc
lue/chrome_async_socket.h
lue/chrome_async_socket_unittest.cc
lue/fake_network_manager.cc
lue/fake_network_manager.h
lue/fake_socket_factory.cc
lue/fake_socket_factory.h
lue/jingle_glue_mock_objects.h
lue/logging_unittest.cc
lue/mock_task.cc
lue/mock_task.h
lue/proxy_resolving_client_socket.cc
lue/task_pump.h
lue/task_pump_unittest.cc
lue/thread_wrapper.cc
lue/thread_wrapper.h
lue/thread_wrapper_unittest.cc
lue/utils.cc
lue/utils.h
lue/xmpp_client_socket_factory.cc
ingle.gyp
ingle_glue.target.darwin-arm.mk
ingle_glue.target.darwin-arm64.mk
ingle_glue.target.darwin-mips.mk
ingle_glue.target.darwin-x86.mk
ingle_glue.target.darwin-x86_64.mk
ingle_glue.target.linux-arm.mk
ingle_glue.target.linux-arm64.mk
ingle_glue.target.linux-mips.mk
ingle_glue.target.linux-x86.mk
ingle_glue.target.linux-x86_64.mk
otifier/DEPS
otifier/base/fake_base_task.cc
otifier/base/gaia_token_pre_xmpp_auth.cc
otifier/base/gaia_token_pre_xmpp_auth.h
otifier/base/weak_xmpp_client.cc
otifier/base/weak_xmpp_client.h
otifier/base/weak_xmpp_client_unittest.cc
otifier/base/xmpp_connection.h
otifier/base/xmpp_connection_unittest.cc
otifier/communicator/connection_settings.cc
otifier/communicator/connection_settings.h
otifier/communicator/connection_settings_unittest.cc
otifier/communicator/login.cc
otifier/communicator/login_settings.cc
otifier/listener/push_notifications_listen_task.cc
otifier/listener/push_notifications_subscribe_task.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
lue/chrome_async_socket_unittest.cc
lue/proxy_resolving_client_socket.cc
lue/thread_wrapper_unittest.cc
lue/utils.cc
ingle_glue.target.darwin-arm.mk
ingle_glue.target.darwin-arm64.mk
ingle_glue.target.darwin-mips.mk
ingle_glue.target.darwin-x86.mk
ingle_glue.target.darwin-x86_64.mk
ingle_glue.target.linux-arm.mk
ingle_glue.target.linux-arm64.mk
ingle_glue.target.linux-mips.mk
ingle_glue.target.linux-x86.mk
ingle_glue.target.linux-x86_64.mk
otifier/base/xmpp_connection_unittest.cc
|
| 6d86b77056ed63eb6871182f42a9fd5f07550f90 |
25-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 278856
This commit was generated by merge_to_master.py.
Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
ingle_glue.target.darwin-arm.mk
ingle_glue.target.darwin-arm64.mk
ingle_glue.target.darwin-mips.mk
ingle_glue.target.darwin-x86.mk
ingle_glue.target.darwin-x86_64.mk
ingle_glue.target.linux-arm.mk
ingle_glue.target.linux-arm64.mk
ingle_glue.target.linux-mips.mk
ingle_glue.target.linux-x86.mk
ingle_glue.target.linux-x86_64.mk
|
| f8ee788a64d60abd8f2d742a5fdedde054ecd910 |
20-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 278205
This commit was generated by merge_to_master.py.
Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
ingle_glue.target.darwin-arm.mk
ingle_glue.target.darwin-arm64.mk
ingle_glue.target.darwin-mips.mk
ingle_glue.target.darwin-x86.mk
ingle_glue.target.darwin-x86_64.mk
ingle_glue.target.linux-arm.mk
ingle_glue.target.linux-arm64.mk
ingle_glue.target.linux-mips.mk
ingle_glue.target.linux-x86.mk
ingle_glue.target.linux-x86_64.mk
|
| 46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd |
09-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 275586
This commit was generated by merge_to_master.py.
Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
ingle_glue.target.darwin-arm.mk
ingle_glue.target.darwin-arm64.mk
ingle_glue.target.darwin-mips.mk
ingle_glue.target.darwin-x86.mk
ingle_glue.target.darwin-x86_64.mk
ingle_glue.target.linux-arm.mk
ingle_glue.target.linux-arm64.mk
ingle_glue.target.linux-mips.mk
ingle_glue.target.linux-x86.mk
ingle_glue.target.linux-x86_64.mk
|
| 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
WNERS
lue/proxy_resolving_client_socket.cc
ingle.gyp
ingle_glue.target.darwin-arm.mk
ingle_glue.target.darwin-arm64.mk
ingle_glue.target.darwin-mips.mk
ingle_glue.target.darwin-x86.mk
ingle_glue.target.darwin-x86_64.mk
ingle_glue.target.linux-arm.mk
ingle_glue.target.linux-arm64.mk
ingle_glue.target.linux-mips.mk
ingle_glue.target.linux-x86.mk
ingle_glue.target.linux-x86_64.mk
ingle_nacl.gyp
|
| 0de6073388f4e2780db8536178b129cd8f6ab386 |
15-May-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 269467
This commit was generated by merge_to_master.py.
Change-Id: Id6c03d44b5ad8b098017a943eb9ec8d804dfed99
ingle_glue.target.darwin-arm.mk
ingle_glue.target.darwin-arm64.mk
ingle_glue.target.darwin-mips.mk
ingle_glue.target.darwin-x86.mk
ingle_glue.target.darwin-x86_64.mk
ingle_glue.target.linux-arm.mk
ingle_glue.target.linux-arm64.mk
ingle_glue.target.linux-mips.mk
ingle_glue.target.linux-x86.mk
ingle_glue.target.linux-x86_64.mk
|
| 010d83a9304c5a91596085d917d248abff47903a |
14-May-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 269336
This commit was generated by merge_to_master.py.
Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
ingle_glue.target.darwin-arm.mk
ingle_glue.target.darwin-x86.mk
ingle_glue.target.darwin-x86_64.mk
ingle_glue.target.linux-arm.mk
ingle_glue.target.linux-x86.mk
ingle_glue.target.linux-x86_64.mk
otifier/listener/notification_defines_unittest.cc
|
| 5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 |
01-May-2014 |
Bo Liu <boliu@google.com> |
Merge from Chromium at DEPS revision 267519
This commit was generated by merge_to_master.py.
Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
ingle_glue.target.darwin-arm64.mk
ingle_glue.target.linux-arm64.mk
|
| 0529e5d033099cbfc42635f6f6183833b09dff6e |
24-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 265802
This commit was generated by merge_to_master.py.
Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
ingle.gyp
ingle_glue.target.darwin-arm.mk
ingle_glue.target.darwin-mips.mk
ingle_glue.target.darwin-x86.mk
ingle_glue.target.darwin-x86_64.mk
ingle_glue.target.linux-arm.mk
ingle_glue.target.linux-mips.mk
ingle_glue.target.linux-x86.mk
ingle_glue.target.linux-x86_64.mk
|
| a02191e04bc25c4935f804f2c080ae28663d096d |
16-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 263965
This commit was generated by merge_to_master.py.
Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
RESUBMIT.py
|
| 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
lue/channel_socket_adapter.cc
lue/channel_socket_adapter.h
lue/fake_ssl_client_socket.cc
lue/fake_ssl_client_socket.h
lue/fake_ssl_client_socket_unittest.cc
lue/proxy_resolving_client_socket.cc
lue/proxy_resolving_client_socket.h
lue/pseudotcp_adapter.cc
lue/pseudotcp_adapter.h
lue/pseudotcp_adapter_unittest.cc
ingle_glue.target.darwin-arm.mk
ingle_glue.target.darwin-mips.mk
ingle_glue.target.darwin-x86.mk
ingle_glue.target.darwin-x86_64.mk
ingle_glue.target.linux-arm.mk
ingle_glue.target.linux-mips.mk
ingle_glue.target.linux-x86.mk
ingle_glue.target.linux-x86_64.mk
|
| 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
lue/proxy_resolving_client_socket.cc
ingle_glue.target.darwin-arm.mk
ingle_glue.target.darwin-mips.mk
ingle_glue.target.darwin-x86.mk
ingle_glue.target.darwin-x86_64.mk
ingle_glue.target.linux-arm.mk
ingle_glue.target.linux-mips.mk
ingle_glue.target.linux-x86.mk
ingle_glue.target.linux-x86_64.mk
|
| effb81e5f8246d0db0270817048dc992db66e9fb |
31-Mar-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 260458
This commit was generated by merge_to_master.py.
Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
ingle.gyp
ingle.gypi
ingle_glue.target.darwin-x86_64.mk
ingle_glue.target.linux-x86_64.mk
ingle_nacl.gyp
|
| 23730a6e56a168d1879203e4b3819bb36e3d8f1f |
21-Mar-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 258528
This commit was generated by merge_to_master.py.
Change-Id: Id197cbdde2c2881915f096c0426c741416884783
WNERS
|
| a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 |
18-Mar-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 257591
This commit was generated by merge_to_master.py.
Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
RESUBMIT.py
|
| 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
lue/channel_socket_adapter.cc
lue/channel_socket_adapter.h
lue/channel_socket_adapter_unittest.cc
lue/fake_socket_factory.cc
lue/fake_socket_factory.h
lue/proxy_resolving_client_socket.cc
otifier/listener/notification_defines.cc
|
| a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 |
18-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 240154
This commit was generated by merge_to_master.py.
Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
otifier/listener/push_notifications_send_update_task.cc
otifier/listener/push_notifications_send_update_task_unittest.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
lue/chrome_async_socket.cc
lue/chrome_async_socket.h
lue/proxy_resolving_client_socket.h
lue/task_pump.cc
lue/task_pump.h
lue/thread_wrapper.cc
lue/thread_wrapper.h
otifier/listener/non_blocking_push_client.cc
otifier/listener/non_blocking_push_client.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
lue/channel_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
lue/channel_socket_adapter.cc
lue/channel_socket_adapter_unittest.cc
lue/fake_socket_factory.cc
lue/fake_socket_factory.h
lue/pseudotcp_adapter_unittest.cc
otifier/communicator/login.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
lue/logging_unittest.cc
ingle.gyp
un_all_unittests.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
lue/channel_socket_adapter_unittest.cc
lue/thread_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
lue/chrome_async_socket.cc
lue/chrome_async_socket_unittest.cc
lue/fake_ssl_client_socket.cc
lue/fake_ssl_client_socket.h
lue/fake_ssl_client_socket_unittest.cc
lue/resolving_client_socket_factory.h
lue/xmpp_client_socket_factory.cc
lue/xmpp_client_socket_factory.h
otifier/listener/push_notifications_subscribe_task.cc
|
| 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
lue/channel_socket_adapter_unittest.cc
|
| d3868032626d59662ff73b372b5d584c1d144c53 |
31-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r214391
This commit was generated by merge_to_master.py.
Change-Id: Iad15fada300ebc6cf9cbcebfc484b1a5f5f372e5
otifier/communicator/single_login_attempt_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
lue/channel_socket_adapter.cc
lue/channel_socket_adapter_unittest.cc
lue/chrome_async_socket.cc
lue/chrome_async_socket_unittest.cc
lue/fake_network_manager.cc
lue/fake_socket_factory.cc
lue/fake_ssl_client_socket_unittest.cc
lue/proxy_resolving_client_socket_unittest.cc
lue/task_pump.cc
lue/task_pump_unittest.cc
lue/thread_wrapper.h
lue/thread_wrapper_unittest.cc
otifier/base/weak_xmpp_client_unittest.cc
otifier/base/xmpp_connection.cc
otifier/base/xmpp_connection_unittest.cc
otifier/communicator/single_login_attempt_unittest.cc
otifier/listener/non_blocking_push_client_unittest.cc
otifier/listener/push_client_unittest.cc
otifier/listener/xmpp_push_client_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
lue/proxy_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
lue/logging_unittest.cc
lue/pseudotcp_adapter.cc
lue/pseudotcp_adapter.h
lue/utils.cc
otifier/communicator/login.cc
otifier/communicator/login.h
otifier/communicator/login_settings.h
|
| 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
lue/chrome_async_socket_unittest.cc
lue/proxy_resolving_client_socket.cc
lue/utils.cc
lue/utils.h
otifier/base/notifier_options_util.cc
|
| 5e3f23d412006dc4db4e659864679f29341e113f |
11-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r205548
This commit was generated by merge_to_master.py.
Change-Id: I6d3c83f1b6c91aecc6bd4bf93562314356dd44b9
ingle_glue.target.darwin-mips.mk
ingle_glue.target.linux-mips.mk
|
| 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
lue/channel_socket_adapter.cc
lue/channel_socket_adapter_unittest.cc
lue/fake_socket_factory.cc
lue/fake_ssl_client_socket.cc
lue/fake_ssl_client_socket_unittest.cc
lue/proxy_resolving_client_socket.cc
lue/pseudotcp_adapter.cc
lue/pseudotcp_adapter_unittest.cc
ingle.gyp
otifier/communicator/single_login_attempt.cc
otifier/listener/non_blocking_push_client.cc
otifier/listener/notification_defines.cc
otifier/listener/notification_defines_unittest.cc
otifier/listener/push_notifications_send_update_task_unittest.cc
otifier/listener/push_notifications_subscribe_task_unittest.cc
otifier/listener/xml_element_util.cc
otifier/listener/xmpp_push_client.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
lue/proxy_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
lue/fake_socket_factory.cc
lue/fake_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
lue/channel_socket_adapter.cc
lue/channel_socket_adapter.h
lue/channel_socket_adapter_unittest.cc
lue/chrome_async_socket.cc
lue/chrome_async_socket_unittest.cc
lue/fake_network_manager.cc
lue/fake_socket_factory.cc
lue/fake_socket_factory.h
lue/fake_ssl_client_socket.cc
lue/fake_ssl_client_socket.h
lue/fake_ssl_client_socket_unittest.cc
lue/proxy_resolving_client_socket.cc
lue/proxy_resolving_client_socket.h
lue/proxy_resolving_client_socket_unittest.cc
lue/pseudotcp_adapter.cc
lue/pseudotcp_adapter.h
lue/pseudotcp_adapter_unittest.cc
lue/task_pump.cc
lue/task_pump_unittest.cc
lue/thread_wrapper.cc
lue/thread_wrapper.h
lue/thread_wrapper_unittest.cc
ingle_glue.target.darwin-arm.mk
ingle_glue.target.darwin-x86.mk
otifier/base/gaia_token_pre_xmpp_auth.cc
otifier/base/weak_xmpp_client.cc
otifier/base/weak_xmpp_client_unittest.cc
otifier/base/xmpp_connection.cc
otifier/base/xmpp_connection_unittest.cc
otifier/communicator/login_settings.cc
otifier/communicator/single_login_attempt.cc
otifier/communicator/single_login_attempt_unittest.cc
otifier/listener/non_blocking_push_client.cc
otifier/listener/non_blocking_push_client_unittest.cc
otifier/listener/push_client_unittest.cc
otifier/listener/xmpp_push_client_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
lue/channel_socket_adapter_unittest.cc
lue/chrome_async_socket.cc
lue/chrome_async_socket_unittest.cc
lue/logging_unittest.cc
lue/proxy_resolving_client_socket.h
lue/proxy_resolving_client_socket_unittest.cc
lue/pseudotcp_adapter_unittest.cc
lue/task_pump_unittest.cc
lue/thread_wrapper_unittest.cc
lue/utils.cc
lue/xmpp_client_socket_factory.h
ingle.gyp
ingle_glue.target.linux-arm.mk
ingle_glue.target.linux-x86.mk
ingle_glue.target.mk
otifier/base/gaia_token_pre_xmpp_auth.cc
otifier/base/xmpp_connection.cc
otifier/base/xmpp_connection_unittest.cc
otifier/communicator/login.cc
otifier/communicator/single_login_attempt.cc
otifier/communicator/single_login_attempt_unittest.cc
otifier/listener/non_blocking_push_client_unittest.cc
otifier/listener/push_client_unittest.cc
otifier/listener/xmpp_push_client.cc
otifier/listener/xmpp_push_client_unittest.cc
|
| 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
WNERS
RESUBMIT.py
lue/DEPS
lue/channel_socket_adapter.cc
lue/channel_socket_adapter.h
lue/channel_socket_adapter_unittest.cc
lue/chrome_async_socket.cc
lue/chrome_async_socket.h
lue/chrome_async_socket_unittest.cc
lue/fake_network_manager.cc
lue/fake_network_manager.h
lue/fake_socket_factory.cc
lue/fake_socket_factory.h
lue/fake_ssl_client_socket.cc
lue/fake_ssl_client_socket.h
lue/fake_ssl_client_socket_unittest.cc
lue/jingle_glue_mock_objects.cc
lue/jingle_glue_mock_objects.h
lue/logging_unittest.cc
lue/mock_task.cc
lue/mock_task.h
lue/proxy_resolving_client_socket.cc
lue/proxy_resolving_client_socket.h
lue/proxy_resolving_client_socket_unittest.cc
lue/pseudotcp_adapter.cc
lue/pseudotcp_adapter.h
lue/pseudotcp_adapter_unittest.cc
lue/resolving_client_socket_factory.h
lue/task_pump.cc
lue/task_pump.h
lue/task_pump_unittest.cc
lue/thread_wrapper.cc
lue/thread_wrapper.h
lue/thread_wrapper_unittest.cc
lue/utils.cc
lue/utils.h
lue/xmpp_client_socket_factory.cc
lue/xmpp_client_socket_factory.h
ingle.gyp
ingle_glue.target.mk
otifier/DEPS
otifier/base/const_communicator.h
otifier/base/fake_base_task.cc
otifier/base/fake_base_task.h
otifier/base/gaia_constants.cc
otifier/base/gaia_constants.h
otifier/base/gaia_token_pre_xmpp_auth.cc
otifier/base/gaia_token_pre_xmpp_auth.h
otifier/base/notification_method.cc
otifier/base/notification_method.h
otifier/base/notifier_options.cc
otifier/base/notifier_options.h
otifier/base/notifier_options_util.cc
otifier/base/notifier_options_util.h
otifier/base/server_information.cc
otifier/base/server_information.h
otifier/base/weak_xmpp_client.cc
otifier/base/weak_xmpp_client.h
otifier/base/weak_xmpp_client_unittest.cc
otifier/base/xmpp_connection.cc
otifier/base/xmpp_connection.h
otifier/base/xmpp_connection_unittest.cc
otifier/communicator/DEPS
otifier/communicator/connection_settings.cc
otifier/communicator/connection_settings.h
otifier/communicator/connection_settings_unittest.cc
otifier/communicator/login.cc
otifier/communicator/login.h
otifier/communicator/login_settings.cc
otifier/communicator/login_settings.h
otifier/communicator/login_settings_unittest.cc
otifier/communicator/single_login_attempt.cc
otifier/communicator/single_login_attempt.h
otifier/communicator/single_login_attempt_unittest.cc
otifier/listener/fake_push_client.cc
otifier/listener/fake_push_client.h
otifier/listener/fake_push_client_observer.cc
otifier/listener/fake_push_client_observer.h
otifier/listener/non_blocking_push_client.cc
otifier/listener/non_blocking_push_client.h
otifier/listener/non_blocking_push_client_unittest.cc
otifier/listener/notification_constants.cc
otifier/listener/notification_constants.h
otifier/listener/notification_defines.cc
otifier/listener/notification_defines.h
otifier/listener/notification_defines_unittest.cc
otifier/listener/push_client.cc
otifier/listener/push_client.h
otifier/listener/push_client_observer.cc
otifier/listener/push_client_observer.h
otifier/listener/push_client_unittest.cc
otifier/listener/push_notifications_listen_task.cc
otifier/listener/push_notifications_listen_task.h
otifier/listener/push_notifications_send_update_task.cc
otifier/listener/push_notifications_send_update_task.h
otifier/listener/push_notifications_send_update_task_unittest.cc
otifier/listener/push_notifications_subscribe_task.cc
otifier/listener/push_notifications_subscribe_task.h
otifier/listener/push_notifications_subscribe_task_unittest.cc
otifier/listener/send_ping_task.cc
otifier/listener/send_ping_task.h
otifier/listener/send_ping_task_unittest.cc
otifier/listener/xml_element_util.cc
otifier/listener/xml_element_util.h
otifier/listener/xml_element_util_unittest.cc
otifier/listener/xmpp_push_client.cc
otifier/listener/xmpp_push_client.h
otifier/listener/xmpp_push_client_unittest.cc
un_all_unittests.cc
|