| 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 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 415 const sync_pb::ExperimentsSpecifics& proto) { | 415 const sync_pb::ExperimentsSpecifics& proto) { |
| 416 base::DictionaryValue* value = new base::DictionaryValue(); | 416 base::DictionaryValue* value = new base::DictionaryValue(); |
| 417 SET_EXPERIMENT_ENABLED_FIELD(keystore_encryption); | 417 SET_EXPERIMENT_ENABLED_FIELD(keystore_encryption); |
| 418 SET_EXPERIMENT_ENABLED_FIELD(history_delete_directives); | 418 SET_EXPERIMENT_ENABLED_FIELD(history_delete_directives); |
| 419 SET_EXPERIMENT_ENABLED_FIELD(autofill_culling); | 419 SET_EXPERIMENT_ENABLED_FIELD(autofill_culling); |
| 420 SET_EXPERIMENT_ENABLED_FIELD(pre_commit_update_avoidance); | 420 SET_EXPERIMENT_ENABLED_FIELD(pre_commit_update_avoidance); |
| 421 SET(favicon_sync, FaviconSyncFlagsToValue); | 421 SET(favicon_sync, FaviconSyncFlagsToValue); |
| 422 SET_EXPERIMENT_ENABLED_FIELD(gcm_channel); | 422 SET_EXPERIMENT_ENABLED_FIELD(gcm_channel); |
| 423 SET(enhanced_bookmarks, EnhancedBookmarksFlagsToValue); | 423 SET(enhanced_bookmarks, EnhancedBookmarksFlagsToValue); |
| 424 SET_EXPERIMENT_ENABLED_FIELD(gcm_invalidations); | 424 SET_EXPERIMENT_ENABLED_FIELD(gcm_invalidations); |
| 425 SET_EXPERIMENT_ENABLED_FIELD(wallet_sync); |
| 425 return value; | 426 return value; |
| 426 } | 427 } |
| 427 | 428 |
| 428 base::DictionaryValue* ExtensionSettingSpecificsToValue( | 429 base::DictionaryValue* ExtensionSettingSpecificsToValue( |
| 429 const sync_pb::ExtensionSettingSpecifics& proto) { | 430 const sync_pb::ExtensionSettingSpecifics& proto) { |
| 430 base::DictionaryValue* value = new base::DictionaryValue(); | 431 base::DictionaryValue* value = new base::DictionaryValue(); |
| 431 SET_STR(extension_id); | 432 SET_STR(extension_id); |
| 432 SET_STR(key); | 433 SET_STR(key); |
| 433 SET_STR(value); | 434 SET_STR(value); |
| 434 return value; | 435 return value; |
| (...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1017 #undef SET_BYTES | 1018 #undef SET_BYTES |
| 1018 #undef SET_INT32 | 1019 #undef SET_INT32 |
| 1019 #undef SET_INT64 | 1020 #undef SET_INT64 |
| 1020 #undef SET_INT64_REP | 1021 #undef SET_INT64_REP |
| 1021 #undef SET_STR | 1022 #undef SET_STR |
| 1022 #undef SET_STR_REP | 1023 #undef SET_STR_REP |
| 1023 | 1024 |
| 1024 #undef SET_FIELD | 1025 #undef SET_FIELD |
| 1025 | 1026 |
| 1026 } // namespace syncer | 1027 } // namespace syncer |
| OLD | NEW |