• Home
  • History
  • Annotate
  • only in /external/chromium_org/sync/api/
History log of /external/chromium_org/sync/api/
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
ttachments/README
ttachments/attachment.cc
ttachments/attachment_store.h
ttachments/fake_attachment_store.h
ttachments/fake_attachment_store_unittest.cc
ync_data.cc
ync_data.h
ync_data_unittest.cc
yncable_service.cc
yncable_service.h
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
ync_error.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
ttachments/README
ttachments/attachment_downloader.cc
ttachments/attachment_downloader.h
ttachments/attachment_service.cc
ttachments/attachment_service.h
ttachments/attachment_service_impl.cc
ttachments/attachment_service_impl.h
ttachments/attachment_service_impl_unittest.cc
ttachments/attachment_service_proxy.cc
ttachments/attachment_service_proxy.h
ttachments/attachment_service_proxy_for_test.cc
ttachments/attachment_service_proxy_for_test.h
ttachments/attachment_service_proxy_unittest.cc
ttachments/attachment_uploader.cc
ttachments/attachment_uploader.h
ttachments/fake_attachment_store.cc
ttachments/fake_attachment_store.h
ttachments/fake_attachment_store_unittest.cc
ync_change_unittest.cc
ync_data.cc
ync_data.h
ync_data_unittest.cc
ync_error.cc
ync_error.h
ync_error_unittest.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
ttachments/attachment_downloader.cc
ttachments/attachment_downloader.h
ttachments/attachment_id.h
ttachments/attachment_service.h
ttachments/attachment_service_impl.cc
ttachments/attachment_service_impl.h
ttachments/attachment_service_impl_unittest.cc
ttachments/attachment_service_proxy.cc
ttachments/attachment_service_proxy.h
ttachments/attachment_service_proxy_for_test.cc
ttachments/attachment_service_proxy_unittest.cc
ttachments/attachment_uploader.h
ync_data.h
ync_data_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
ync_error.cc
ync_error.h
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
ake_sync_change_processor.cc
ake_sync_change_processor.h
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
ttachments/attachment_id.h
ttachments/attachment_service_impl.cc
ttachments/attachment_service_impl.h
ttachments/attachment_service_impl_unittest.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
ttachments/attachment_downloader.cc
ttachments/attachment_downloader.h
ttachments/attachment_service.h
ttachments/attachment_service_impl.cc
ttachments/attachment_service_impl.h
ttachments/attachment_service_proxy_for_test.cc
ttachments/attachment_store.h
ttachments/attachment_uploader.h
ttachments/fake_attachment_service.cc
ttachments/fake_attachment_service.h
ttachments/fake_attachment_store.cc
ttachments/fake_attachment_store.h
ttachments/fake_attachment_store_unittest.cc
ttachments/fake_attachment_uploader.cc
ttachments/fake_attachment_uploader.h
ttachments/fake_attachment_uploader_unittest.cc
ync_data_unittest.cc
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
ttachments/attachment_id.cc
ttachments/attachment_service.h
ttachments/attachment_service_proxy.cc
ttachments/attachment_service_proxy.h
ttachments/attachment_service_proxy_unittest.cc
ttachments/attachment_uploader.cc
ttachments/attachment_uploader.h
ttachments/fake_attachment_service.cc
ttachments/fake_attachment_service.h
ttachments/fake_attachment_uploader.cc
ttachments/fake_attachment_uploader.h
ttachments/fake_attachment_uploader_unittest.cc
ync_data.cc
ync_data.h
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
ttachments/attachment_service_proxy_for_test.cc
ttachments/attachment_service_proxy_for_test.h
ttachments/fake_attachment_service.cc
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
ttachments/attachment_service.h
ttachments/attachment_service_proxy.cc
ttachments/attachment_service_proxy_unittest.cc
ttachments/attachment_store.h
ttachments/fake_attachment_service.cc
ttachments/fake_attachment_service.h
ttachments/fake_attachment_store.cc
ttachments/fake_attachment_store.h
ttachments/fake_attachment_store_unittest.cc
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
ttachments/attachment_service_proxy.cc
ttachments/attachment_service_proxy.h
ttachments/attachment_service_proxy_for_test.cc
ttachments/attachment_service_proxy_for_test.h
ync_change_unittest.cc
ync_data.cc
ync_data.h
ync_data_unittest.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
ync_change_processor.cc
ync_change_processor.h
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
ttachments/attachment.cc
ttachments/attachment.h
ttachments/attachment_id.cc
ttachments/attachment_id.h
ttachments/attachment_service.cc
ttachments/attachment_service.h
ttachments/attachment_service_proxy.cc
ttachments/attachment_service_proxy.h
ttachments/attachment_service_proxy_unittest.cc
ttachments/attachment_store.h
ttachments/attachment_unittest.cc
ttachments/fake_attachment_service.cc
ttachments/fake_attachment_service.h
ttachments/fake_attachment_store.cc
ttachments/fake_attachment_store.h
ttachments/fake_attachment_store_unittest.cc
ync_change.cc
ync_change_processor.h
ync_change_unittest.cc
ync_data.cc
ync_data.h
ync_data_unittest.cc
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
ttachments/attachment.cc
ttachments/attachment.h
ttachments/attachment_id.cc
ttachments/attachment_id.h
ttachments/attachment_id_unittest.cc
ttachments/attachment_store.h
ttachments/attachment_unittest.cc
ttachments/fake_attachment_store.cc
ttachments/fake_attachment_store.h
ttachments/fake_attachment_store_unittest.cc
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
ttachments/attachment.cc
ttachments/attachment.h
ttachments/attachment_store.h
ttachments/attachment_unittest.cc
ttachments/fake_attachment_store.cc
ttachments/fake_attachment_store.h
ttachments/fake_attachment_store_unittest.cc
ake_sync_change_processor.cc
ake_sync_change_processor.h
ync_change_processor_wrapper_for_test.cc
ync_change_processor_wrapper_for_test.h
ync_data_unittest.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
ttachments/attachment.cc
ttachments/attachment.h
ttachments/attachment_store.cc
ttachments/attachment_store.h
ttachments/attachment_unittest.cc
ttachments/fake_attachment_store.cc
ttachments/fake_attachment_store.h
ttachments/fake_attachment_store_unittest.cc
ake_sync_change_processor.cc
ake_sync_change_processor.h
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
ync_change_processor.h
yncable_service.h
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
ync_change_unittest.cc
ync_data.cc
ync_data.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
ync_change_unittest.cc
ync_data.cc
ync_error.cc
ync_error.h
ync_error_unittest.cc
ync_merge_result.cc
ync_merge_result_unittest.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
ync_merge_result.cc
ync_merge_result.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
ync_data.cc
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
ync_data.cc
yncable_service.h
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
EPS
ake_syncable_service.cc
ake_syncable_service.h
ync_change.h
ync_change_processor.h
ync_data.h
ync_error.h
ync_error_factory.h
ync_merge_result.cc
ync_merge_result.h
ync_merge_result_unittest.cc
yncable_service.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
ake_syncable_service.cc
ake_syncable_service.h
tring_ordinal.h
ync_change.cc
ync_change.h
ync_change_processor.cc
ync_change_processor.h
ync_change_unittest.cc
ync_data.cc
ync_data.h
ync_error.cc
ync_error.h
ync_error_factory.cc
ync_error_factory.h
ync_error_factory_mock.cc
ync_error_factory_mock.h
ync_error_unittest.cc
yncable_service.cc
yncable_service.h
ime.h