| 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 #include "sync/syncable/entry_kernel.h" | 5 #include "sync/syncable/entry_kernel.h" |
| 6 | 6 |
| 7 #include "base/strings/string_number_conversions.h" | 7 #include "base/strings/string_number_conversions.h" |
| 8 #include "sync/protocol/proto_value_conversions.h" | 8 #include "sync/protocol/proto_value_conversions.h" |
| 9 #include "sync/syncable/syncable_enum_conversions.h" | 9 #include "sync/syncable/syncable_enum_conversions.h" |
| 10 #include "sync/util/cryptographer.h" | 10 #include "sync/util/cryptographer.h" |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 } | 118 } |
| 119 | 119 |
| 120 base::FundamentalValue* BooleanToValue(bool bool_val) { | 120 base::FundamentalValue* BooleanToValue(bool bool_val) { |
| 121 return new base::FundamentalValue(bool_val); | 121 return new base::FundamentalValue(bool_val); |
| 122 } | 122 } |
| 123 | 123 |
| 124 base::StringValue* StringToValue(const std::string& str) { | 124 base::StringValue* StringToValue(const std::string& str) { |
| 125 return new base::StringValue(str); | 125 return new base::StringValue(str); |
| 126 } | 126 } |
| 127 | 127 |
| 128 StringValue* UniquePositionToValue(const UniquePosition& pos) { | 128 base::StringValue* UniquePositionToValue(const UniquePosition& pos) { |
| 129 return Value::CreateStringValue(pos.ToDebugString()); | 129 return base::Value::CreateStringValue(pos.ToDebugString()); |
| 130 } | 130 } |
| 131 | 131 |
| 132 } // namespace | 132 } // namespace |
| 133 | 133 |
| 134 base::DictionaryValue* EntryKernel::ToValue( | 134 base::DictionaryValue* EntryKernel::ToValue( |
| 135 Cryptographer* cryptographer) const { | 135 Cryptographer* cryptographer) const { |
| 136 base::DictionaryValue* kernel_info = new base::DictionaryValue(); | 136 base::DictionaryValue* kernel_info = new base::DictionaryValue(); |
| 137 kernel_info->SetBoolean("isDirty", is_dirty()); | 137 kernel_info->SetBoolean("isDirty", is_dirty()); |
| 138 kernel_info->Set("serverModelType", ModelTypeToValue(GetServerModelType())); | 138 kernel_info->Set("serverModelType", ModelTypeToValue(GetServerModelType())); |
| 139 | 139 |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 base::DictionaryValue* EntryKernelMutationToValue( | 207 base::DictionaryValue* EntryKernelMutationToValue( |
| 208 const EntryKernelMutation& mutation) { | 208 const EntryKernelMutation& mutation) { |
| 209 base::DictionaryValue* dict = new base::DictionaryValue(); | 209 base::DictionaryValue* dict = new base::DictionaryValue(); |
| 210 dict->Set("original", mutation.original.ToValue(NULL)); | 210 dict->Set("original", mutation.original.ToValue(NULL)); |
| 211 dict->Set("mutated", mutation.mutated.ToValue(NULL)); | 211 dict->Set("mutated", mutation.mutated.ToValue(NULL)); |
| 212 return dict; | 212 return dict; |
| 213 } | 213 } |
| 214 | 214 |
| 215 } // namespace syncer | 215 } // namespace syncer |
| 216 } // namespace syncable | 216 } // namespace syncable |
| OLD | NEW |