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 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
485 return value; | 485 return value; |
486 } | 486 } |
487 | 487 |
488 base::DictionaryValue* ManagedUserSpecificsToValue( | 488 base::DictionaryValue* ManagedUserSpecificsToValue( |
489 const sync_pb::ManagedUserSpecifics& proto) { | 489 const sync_pb::ManagedUserSpecifics& proto) { |
490 base::DictionaryValue* value = new base::DictionaryValue(); | 490 base::DictionaryValue* value = new base::DictionaryValue(); |
491 SET_STR(id); | 491 SET_STR(id); |
492 SET_STR(name); | 492 SET_STR(name); |
493 SET_BOOL(acknowledged); | 493 SET_BOOL(acknowledged); |
494 SET_STR(master_key); | 494 SET_STR(master_key); |
| 495 SET_STR(chrome_avatar); |
| 496 SET_STR(chromeos_avatar); |
495 return value; | 497 return value; |
496 } | 498 } |
497 | 499 |
498 base::DictionaryValue* NigoriSpecificsToValue( | 500 base::DictionaryValue* NigoriSpecificsToValue( |
499 const sync_pb::NigoriSpecifics& proto) { | 501 const sync_pb::NigoriSpecifics& proto) { |
500 base::DictionaryValue* value = new base::DictionaryValue(); | 502 base::DictionaryValue* value = new base::DictionaryValue(); |
501 SET(encryption_keybag, EncryptedDataToValue); | 503 SET(encryption_keybag, EncryptedDataToValue); |
502 SET_BOOL(keybag_is_frozen); | 504 SET_BOOL(keybag_is_frozen); |
503 SET_BOOL(encrypt_bookmarks); | 505 SET_BOOL(encrypt_bookmarks); |
504 SET_BOOL(encrypt_preferences); | 506 SET_BOOL(encrypt_preferences); |
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
927 #undef SET_BYTES | 929 #undef SET_BYTES |
928 #undef SET_INT32 | 930 #undef SET_INT32 |
929 #undef SET_INT64 | 931 #undef SET_INT64 |
930 #undef SET_INT64_REP | 932 #undef SET_INT64_REP |
931 #undef SET_STR | 933 #undef SET_STR |
932 #undef SET_STR_REP | 934 #undef SET_STR_REP |
933 | 935 |
934 #undef SET_FIELD | 936 #undef SET_FIELD |
935 | 937 |
936 } // namespace syncer | 938 } // namespace syncer |
OLD | NEW |