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 // 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 "chrome/browser/sync/protocol/proto_value_conversions.h" | 7 #include "chrome/browser/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 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
231 SET_BOOL(encrypt_bookmarks); | 231 SET_BOOL(encrypt_bookmarks); |
232 SET_BOOL(encrypt_preferences); | 232 SET_BOOL(encrypt_preferences); |
233 SET_BOOL(encrypt_autofill_profile); | 233 SET_BOOL(encrypt_autofill_profile); |
234 SET_BOOL(encrypt_autofill); | 234 SET_BOOL(encrypt_autofill); |
235 SET_BOOL(encrypt_themes); | 235 SET_BOOL(encrypt_themes); |
236 SET_BOOL(encrypt_typed_urls); | 236 SET_BOOL(encrypt_typed_urls); |
237 SET_BOOL(encrypt_extensions); | 237 SET_BOOL(encrypt_extensions); |
238 SET_BOOL(encrypt_sessions); | 238 SET_BOOL(encrypt_sessions); |
239 SET_BOOL(encrypt_apps); | 239 SET_BOOL(encrypt_apps); |
240 SET_BOOL(encrypt_search_engines); | 240 SET_BOOL(encrypt_search_engines); |
| 241 SET_BOOL(sync_tabs); |
241 return value; | 242 return value; |
242 } | 243 } |
243 | 244 |
244 DictionaryValue* PasswordSpecificsToValue( | 245 DictionaryValue* PasswordSpecificsToValue( |
245 const sync_pb::PasswordSpecifics& proto) { | 246 const sync_pb::PasswordSpecifics& proto) { |
246 DictionaryValue* value = new DictionaryValue(); | 247 DictionaryValue* value = new DictionaryValue(); |
247 SET(encrypted, EncryptedDataToValue); | 248 SET(encrypted, EncryptedDataToValue); |
248 return value; | 249 return value; |
249 } | 250 } |
250 | 251 |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
335 #undef SET_BOOL | 336 #undef SET_BOOL |
336 #undef SET_BYTES | 337 #undef SET_BYTES |
337 #undef SET_INT32 | 338 #undef SET_INT32 |
338 #undef SET_INT64 | 339 #undef SET_INT64 |
339 #undef SET_INT64_REP | 340 #undef SET_INT64_REP |
340 #undef SET_STR | 341 #undef SET_STR |
341 | 342 |
342 #undef SET_EXTENSION | 343 #undef SET_EXTENSION |
343 | 344 |
344 } // namespace browser_sync | 345 } // namespace browser_sync |
OLD | NEW |