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/profile_sync_service.h" | 5 #include "chrome/browser/sync/profile_sync_service.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <map> | 8 #include <map> |
9 #include <ostream> | 9 #include <ostream> |
10 #include <set> | 10 #include <set> |
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
297 PrefService::UNSYNCABLE_PREF); | 297 PrefService::UNSYNCABLE_PREF); |
298 pref_service->RegisterBooleanPref(prefs::kSyncTypedUrls, | 298 pref_service->RegisterBooleanPref(prefs::kSyncTypedUrls, |
299 enable_by_default, | 299 enable_by_default, |
300 PrefService::UNSYNCABLE_PREF); | 300 PrefService::UNSYNCABLE_PREF); |
301 pref_service->RegisterBooleanPref(prefs::kSyncExtensions, | 301 pref_service->RegisterBooleanPref(prefs::kSyncExtensions, |
302 enable_by_default, | 302 enable_by_default, |
303 PrefService::UNSYNCABLE_PREF); | 303 PrefService::UNSYNCABLE_PREF); |
304 pref_service->RegisterBooleanPref(prefs::kSyncApps, | 304 pref_service->RegisterBooleanPref(prefs::kSyncApps, |
305 enable_by_default, | 305 enable_by_default, |
306 PrefService::UNSYNCABLE_PREF); | 306 PrefService::UNSYNCABLE_PREF); |
| 307 pref_service->RegisterBooleanPref(prefs::kSyncSearchEngines, |
| 308 enable_by_default, |
| 309 PrefService::UNSYNCABLE_PREF); |
307 pref_service->RegisterBooleanPref(prefs::kSyncSessions, | 310 pref_service->RegisterBooleanPref(prefs::kSyncSessions, |
308 enable_by_default, | 311 enable_by_default, |
309 PrefService::UNSYNCABLE_PREF); | 312 PrefService::UNSYNCABLE_PREF); |
310 pref_service->RegisterBooleanPref(prefs::kKeepEverythingSynced, | 313 pref_service->RegisterBooleanPref(prefs::kKeepEverythingSynced, |
311 enable_by_default, | 314 enable_by_default, |
312 PrefService::UNSYNCABLE_PREF); | 315 PrefService::UNSYNCABLE_PREF); |
313 pref_service->RegisterBooleanPref(prefs::kSyncManaged, | 316 pref_service->RegisterBooleanPref(prefs::kSyncManaged, |
314 false, | 317 false, |
315 PrefService::UNSYNCABLE_PREF); | 318 PrefService::UNSYNCABLE_PREF); |
316 pref_service->RegisterStringPref(prefs::kEncryptionBootstrapToken, | 319 pref_service->RegisterStringPref(prefs::kEncryptionBootstrapToken, |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
534 case syncable::AUTOFILL_PROFILE: | 537 case syncable::AUTOFILL_PROFILE: |
535 return prefs::kSyncAutofillProfile; | 538 return prefs::kSyncAutofillProfile; |
536 case syncable::THEMES: | 539 case syncable::THEMES: |
537 return prefs::kSyncThemes; | 540 return prefs::kSyncThemes; |
538 case syncable::TYPED_URLS: | 541 case syncable::TYPED_URLS: |
539 return prefs::kSyncTypedUrls; | 542 return prefs::kSyncTypedUrls; |
540 case syncable::EXTENSIONS: | 543 case syncable::EXTENSIONS: |
541 return prefs::kSyncExtensions; | 544 return prefs::kSyncExtensions; |
542 case syncable::APPS: | 545 case syncable::APPS: |
543 return prefs::kSyncApps; | 546 return prefs::kSyncApps; |
| 547 case syncable::SEARCH_ENGINES: |
| 548 return prefs::kSyncSearchEngines; |
544 case syncable::SESSIONS: | 549 case syncable::SESSIONS: |
545 return prefs::kSyncSessions; | 550 return prefs::kSyncSessions; |
546 default: | 551 default: |
547 break; | 552 break; |
548 } | 553 } |
549 NOTREACHED(); | 554 NOTREACHED(); |
550 return NULL; | 555 return NULL; |
551 } | 556 } |
552 | 557 |
553 // An invariant has been violated. Transition to an error state where we try | 558 // An invariant has been violated. Transition to an error state where we try |
(...skipping 929 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1483 *profile_->GetPrefs()->GetList(prefs::kAcknowledgedSyncTypes)); | 1488 *profile_->GetPrefs()->GetList(prefs::kAcknowledgedSyncTypes)); |
1484 syncable::ModelTypeSet registered; | 1489 syncable::ModelTypeSet registered; |
1485 GetRegisteredDataTypes(®istered); | 1490 GetRegisteredDataTypes(®istered); |
1486 syncable::ModelTypeBitSet registered_bit_set = | 1491 syncable::ModelTypeBitSet registered_bit_set = |
1487 syncable::ModelTypeBitSetFromSet(registered); | 1492 syncable::ModelTypeBitSetFromSet(registered); |
1488 unacknowledged = registered_bit_set & ~acknowledged; | 1493 unacknowledged = registered_bit_set & ~acknowledged; |
1489 } | 1494 } |
1490 return unacknowledged; | 1495 return unacknowledged; |
1491 } | 1496 } |
1492 | 1497 |
OLD | NEW |