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 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
449 } | 449 } |
450 | 450 |
451 scoped_ptr<base::DictionaryValue> ExtensionSpecificsToValue( | 451 scoped_ptr<base::DictionaryValue> ExtensionSpecificsToValue( |
452 const sync_pb::ExtensionSpecifics& proto) { | 452 const sync_pb::ExtensionSpecifics& proto) { |
453 scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue()); | 453 scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue()); |
454 SET_STR(id); | 454 SET_STR(id); |
455 SET_STR(version); | 455 SET_STR(version); |
456 SET_STR(update_url); | 456 SET_STR(update_url); |
457 SET_BOOL(enabled); | 457 SET_BOOL(enabled); |
458 SET_BOOL(incognito_enabled); | 458 SET_BOOL(incognito_enabled); |
| 459 SET_STR(name); |
459 SET_BOOL(remote_install); | 460 SET_BOOL(remote_install); |
460 SET_BOOL(installed_by_custodian); | 461 SET_BOOL(installed_by_custodian); |
461 SET_BOOL(all_urls_enabled); | 462 SET_BOOL(all_urls_enabled); |
462 SET_STR(name); | 463 SET_INT32(disable_reasons); |
463 return value; | 464 return value; |
464 } | 465 } |
465 | 466 |
466 namespace { | 467 namespace { |
467 scoped_ptr<base::DictionaryValue> FaviconDataToValue( | 468 scoped_ptr<base::DictionaryValue> FaviconDataToValue( |
468 const sync_pb::FaviconData& proto) { | 469 const sync_pb::FaviconData& proto) { |
469 scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue()); | 470 scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue()); |
470 SET_BYTES(favicon); | 471 SET_BYTES(favicon); |
471 SET_INT32(width); | 472 SET_INT32(width); |
472 SET_INT32(height); | 473 SET_INT32(height); |
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1066 #undef SET_BYTES | 1067 #undef SET_BYTES |
1067 #undef SET_INT32 | 1068 #undef SET_INT32 |
1068 #undef SET_INT64 | 1069 #undef SET_INT64 |
1069 #undef SET_INT64_REP | 1070 #undef SET_INT64_REP |
1070 #undef SET_STR | 1071 #undef SET_STR |
1071 #undef SET_STR_REP | 1072 #undef SET_STR_REP |
1072 | 1073 |
1073 #undef SET_FIELD | 1074 #undef SET_FIELD |
1074 | 1075 |
1075 } // namespace syncer | 1076 } // namespace syncer |
OLD | NEW |