| 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 "base/base64.h" | 9 #include "base/base64.h" | 
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" | 
| (...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 345 } | 345 } | 
| 346 | 346 | 
| 347 } | 347 } | 
| 348 | 348 | 
| 349 base::DictionaryValue* ExperimentsSpecificsToValue( | 349 base::DictionaryValue* ExperimentsSpecificsToValue( | 
| 350     const sync_pb::ExperimentsSpecifics& proto) { | 350     const sync_pb::ExperimentsSpecifics& proto) { | 
| 351   base::DictionaryValue* value = new base::DictionaryValue(); | 351   base::DictionaryValue* value = new base::DictionaryValue(); | 
| 352   SET_EXPERIMENT_ENABLED_FIELD(keystore_encryption); | 352   SET_EXPERIMENT_ENABLED_FIELD(keystore_encryption); | 
| 353   SET_EXPERIMENT_ENABLED_FIELD(history_delete_directives); | 353   SET_EXPERIMENT_ENABLED_FIELD(history_delete_directives); | 
| 354   SET_EXPERIMENT_ENABLED_FIELD(autofill_culling); | 354   SET_EXPERIMENT_ENABLED_FIELD(autofill_culling); | 
|  | 355   SET_EXPERIMENT_ENABLED_FIELD(pre_commit_update_avoidance); | 
| 355   if (proto.has_favicon_sync()) | 356   if (proto.has_favicon_sync()) | 
| 356     SET(favicon_sync, FaviconSyncFlagsToValue); | 357     SET(favicon_sync, FaviconSyncFlagsToValue); | 
| 357   return value; | 358   return value; | 
| 358 } | 359 } | 
| 359 | 360 | 
| 360 base::DictionaryValue* ExtensionSettingSpecificsToValue( | 361 base::DictionaryValue* ExtensionSettingSpecificsToValue( | 
| 361     const sync_pb::ExtensionSettingSpecifics& proto) { | 362     const sync_pb::ExtensionSettingSpecifics& proto) { | 
| 362   base::DictionaryValue* value = new base::DictionaryValue(); | 363   base::DictionaryValue* value = new base::DictionaryValue(); | 
| 363   SET_STR(extension_id); | 364   SET_STR(extension_id); | 
| 364   SET_STR(key); | 365   SET_STR(key); | 
| (...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 857 #undef SET_BYTES | 858 #undef SET_BYTES | 
| 858 #undef SET_INT32 | 859 #undef SET_INT32 | 
| 859 #undef SET_INT64 | 860 #undef SET_INT64 | 
| 860 #undef SET_INT64_REP | 861 #undef SET_INT64_REP | 
| 861 #undef SET_STR | 862 #undef SET_STR | 
| 862 #undef SET_STR_REP | 863 #undef SET_STR_REP | 
| 863 | 864 | 
| 864 #undef SET_FIELD | 865 #undef SET_FIELD | 
| 865 | 866 | 
| 866 }  // namespace syncer | 867 }  // namespace syncer | 
| OLD | NEW | 
|---|