OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 // Keep this file in sync with the .proto files in this directory. | 5 // Keep this file in sync with the .proto files in this directory. |
6 | 6 |
7 #include "sync/protocol/proto_value_conversions.h" | 7 #include "sync/protocol/proto_value_conversions.h" |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
492 | 492 |
493 base::DictionaryValue* DeviceInfoSpecificsToValue( | 493 base::DictionaryValue* DeviceInfoSpecificsToValue( |
494 const sync_pb::DeviceInfoSpecifics& proto) { | 494 const sync_pb::DeviceInfoSpecifics& proto) { |
495 base::DictionaryValue* value = new base::DictionaryValue(); | 495 base::DictionaryValue* value = new base::DictionaryValue(); |
496 SET_STR(cache_guid); | 496 SET_STR(cache_guid); |
497 SET_STR(client_name); | 497 SET_STR(client_name); |
498 SET_ENUM(device_type, GetDeviceTypeString); | 498 SET_ENUM(device_type, GetDeviceTypeString); |
499 SET_STR(sync_user_agent); | 499 SET_STR(sync_user_agent); |
500 SET_STR(chrome_version); | 500 SET_STR(chrome_version); |
501 SET_TIME_STR(backup_timestamp); | 501 SET_TIME_STR(backup_timestamp); |
| 502 SET_STR(signin_scoped_device_id); |
502 return value; | 503 return value; |
503 } | 504 } |
504 | 505 |
505 base::DictionaryValue* DictionarySpecificsToValue( | 506 base::DictionaryValue* DictionarySpecificsToValue( |
506 const sync_pb::DictionarySpecifics& proto) { | 507 const sync_pb::DictionarySpecifics& proto) { |
507 base::DictionaryValue* value = new base::DictionaryValue(); | 508 base::DictionaryValue* value = new base::DictionaryValue(); |
508 SET_STR(word); | 509 SET_STR(word); |
509 return value; | 510 return value; |
510 } | 511 } |
511 | 512 |
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1121 #undef SET_BYTES | 1122 #undef SET_BYTES |
1122 #undef SET_INT32 | 1123 #undef SET_INT32 |
1123 #undef SET_INT64 | 1124 #undef SET_INT64 |
1124 #undef SET_INT64_REP | 1125 #undef SET_INT64_REP |
1125 #undef SET_STR | 1126 #undef SET_STR |
1126 #undef SET_STR_REP | 1127 #undef SET_STR_REP |
1127 | 1128 |
1128 #undef SET_FIELD | 1129 #undef SET_FIELD |
1129 | 1130 |
1130 } // namespace syncer | 1131 } // namespace syncer |
OLD | NEW |