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 "base/base64.h" | 5 #include "base/base64.h" |
6 #include "chrome/browser/sync/util/cryptographer.h" | 6 #include "chrome/browser/sync/util/cryptographer.h" |
7 #include "chrome/browser/password_manager/encryptor.h" | 7 #include "chrome/browser/password_manager/encryptor.h" |
8 | 8 |
9 namespace browser_sync { | 9 namespace browser_sync { |
10 | 10 |
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
268 if (nigori.encrypt_autofill_profile()) | 268 if (nigori.encrypt_autofill_profile()) |
269 encrypted_types_.insert(syncable::AUTOFILL_PROFILE); | 269 encrypted_types_.insert(syncable::AUTOFILL_PROFILE); |
270 if (nigori.encrypt_autofill()) | 270 if (nigori.encrypt_autofill()) |
271 encrypted_types_.insert(syncable::AUTOFILL); | 271 encrypted_types_.insert(syncable::AUTOFILL); |
272 if (nigori.encrypt_themes()) | 272 if (nigori.encrypt_themes()) |
273 encrypted_types_.insert(syncable::THEMES); | 273 encrypted_types_.insert(syncable::THEMES); |
274 if (nigori.encrypt_typed_urls()) | 274 if (nigori.encrypt_typed_urls()) |
275 encrypted_types_.insert(syncable::TYPED_URLS); | 275 encrypted_types_.insert(syncable::TYPED_URLS); |
276 if (nigori.encrypt_extensions()) | 276 if (nigori.encrypt_extensions()) |
277 encrypted_types_.insert(syncable::EXTENSIONS); | 277 encrypted_types_.insert(syncable::EXTENSIONS); |
| 278 if (nigori.encrypt_search_engines()) |
| 279 encrypted_types_.insert(syncable::SEARCH_ENGINES); |
278 if (nigori.encrypt_sessions()) | 280 if (nigori.encrypt_sessions()) |
279 encrypted_types_.insert(syncable::SESSIONS); | 281 encrypted_types_.insert(syncable::SESSIONS); |
280 if (nigori.encrypt_apps()) | 282 if (nigori.encrypt_apps()) |
281 encrypted_types_.insert(syncable::APPS); | 283 encrypted_types_.insert(syncable::APPS); |
282 encrypted_types_.insert(syncable::PASSWORDS); | 284 encrypted_types_.insert(syncable::PASSWORDS); |
283 } | 285 } |
284 | 286 |
285 syncable::ModelTypeSet Cryptographer::GetEncryptedTypes() const { | 287 syncable::ModelTypeSet Cryptographer::GetEncryptedTypes() const { |
286 return encrypted_types_; | 288 return encrypted_types_; |
287 } | 289 } |
(...skipping 13 matching lines...) Expand all Loading... |
301 continue; | 303 continue; |
302 } | 304 } |
303 nigoris_[key.name()] = make_linked_ptr(new_nigori.release()); | 305 nigoris_[key.name()] = make_linked_ptr(new_nigori.release()); |
304 } | 306 } |
305 } | 307 } |
306 DCHECK(nigoris_.end() != nigoris_.find(default_key_name)); | 308 DCHECK(nigoris_.end() != nigoris_.find(default_key_name)); |
307 default_nigori_ = &*nigoris_.find(default_key_name); | 309 default_nigori_ = &*nigoris_.find(default_key_name); |
308 } | 310 } |
309 | 311 |
310 } // namespace browser_sync | 312 } // namespace browser_sync |
OLD | NEW |