| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/sync/engine/syncapi.h" | 5 #include "chrome/browser/sync/engine/syncapi.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <bitset> | 8 #include <bitset> |
| 9 #include <iomanip> | 9 #include <iomanip> |
| 10 #include <list> | 10 #include <list> |
| (...skipping 1162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1173 } | 1173 } |
| 1174 node_value = node_dict; | 1174 node_value = node_dict; |
| 1175 } else { | 1175 } else { |
| 1176 ReadNode node(trans); | 1176 ReadNode node(trans); |
| 1177 if (node.InitByIdLookup(id)) { | 1177 if (node.InitByIdLookup(id)) { |
| 1178 node_value = node.GetDetailsAsValue(); | 1178 node_value = node.GetDetailsAsValue(); |
| 1179 } | 1179 } |
| 1180 } | 1180 } |
| 1181 if (!node_value) { | 1181 if (!node_value) { |
| 1182 NOTREACHED(); | 1182 NOTREACHED(); |
| 1183 node_value = Value::CreateNullValue(); | 1183 node_value = base::NullValue(); |
| 1184 } | 1184 } |
| 1185 value->Set("node", node_value); | 1185 value->Set("node", node_value); |
| 1186 return value; | 1186 return value; |
| 1187 } | 1187 } |
| 1188 | 1188 |
| 1189 SyncManager::ExtraPasswordChangeRecordData::ExtraPasswordChangeRecordData() {} | 1189 SyncManager::ExtraPasswordChangeRecordData::ExtraPasswordChangeRecordData() {} |
| 1190 | 1190 |
| 1191 SyncManager::ExtraPasswordChangeRecordData::ExtraPasswordChangeRecordData( | 1191 SyncManager::ExtraPasswordChangeRecordData::ExtraPasswordChangeRecordData( |
| 1192 const sync_pb::PasswordSpecificsData& data) | 1192 const sync_pb::PasswordSpecificsData& data) |
| 1193 : unencrypted_(data) { | 1193 : unencrypted_(data) { |
| (...skipping 1880 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3074 void SyncManager::TriggerOnIncomingNotificationForTest( | 3074 void SyncManager::TriggerOnIncomingNotificationForTest( |
| 3075 const syncable::ModelTypeBitSet& model_types) { | 3075 const syncable::ModelTypeBitSet& model_types) { |
| 3076 syncable::ModelTypePayloadMap model_types_with_payloads = | 3076 syncable::ModelTypePayloadMap model_types_with_payloads = |
| 3077 syncable::ModelTypePayloadMapFromBitSet(model_types, | 3077 syncable::ModelTypePayloadMapFromBitSet(model_types, |
| 3078 std::string()); | 3078 std::string()); |
| 3079 | 3079 |
| 3080 data_->OnIncomingNotification(model_types_with_payloads); | 3080 data_->OnIncomingNotification(model_types_with_payloads); |
| 3081 } | 3081 } |
| 3082 | 3082 |
| 3083 } // namespace sync_api | 3083 } // namespace sync_api |
| OLD | NEW |