| 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 "components/sync_driver/sync_prefs.h" | 5 #include "components/sync_driver/sync_prefs.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/prefs/pref_member.h" | 9 #include "base/prefs/pref_member.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 DCHECK(pref_service); | 22 DCHECK(pref_service); |
| 23 RegisterPrefGroups(); | 23 RegisterPrefGroups(); |
| 24 // Watch the preference that indicates sync is managed so we can take | 24 // Watch the preference that indicates sync is managed so we can take |
| 25 // appropriate action. | 25 // appropriate action. |
| 26 pref_sync_managed_.Init( | 26 pref_sync_managed_.Init( |
| 27 prefs::kSyncManaged, | 27 prefs::kSyncManaged, |
| 28 pref_service_, | 28 pref_service_, |
| 29 base::Bind(&SyncPrefs::OnSyncManagedPrefChanged, base::Unretained(this))); | 29 base::Bind(&SyncPrefs::OnSyncManagedPrefChanged, base::Unretained(this))); |
| 30 } | 30 } |
| 31 | 31 |
| 32 SyncPrefs::SyncPrefs() : pref_service_(NULL) {} |
| 33 |
| 32 SyncPrefs::~SyncPrefs() { DCHECK(CalledOnValidThread()); } | 34 SyncPrefs::~SyncPrefs() { DCHECK(CalledOnValidThread()); } |
| 33 | 35 |
| 34 // static | 36 // static |
| 35 void SyncPrefs::RegisterProfilePrefs( | 37 void SyncPrefs::RegisterProfilePrefs( |
| 36 user_prefs::PrefRegistrySyncable* registry) { | 38 user_prefs::PrefRegistrySyncable* registry) { |
| 37 registry->RegisterBooleanPref( | 39 registry->RegisterBooleanPref( |
| 38 prefs::kSyncHasSetupCompleted, | 40 prefs::kSyncHasSetupCompleted, |
| 39 false, | 41 false, |
| 40 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 42 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 41 registry->RegisterBooleanPref( | 43 registry->RegisterBooleanPref( |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 model_set.Put(syncer::NIGORI); | 130 model_set.Put(syncer::NIGORI); |
| 129 model_set.Put(syncer::SEARCH_ENGINES); | 131 model_set.Put(syncer::SEARCH_ENGINES); |
| 130 model_set.Put(syncer::APPS); | 132 model_set.Put(syncer::APPS); |
| 131 model_set.Put(syncer::APP_LIST); | 133 model_set.Put(syncer::APP_LIST); |
| 132 model_set.Put(syncer::TYPED_URLS); | 134 model_set.Put(syncer::TYPED_URLS); |
| 133 model_set.Put(syncer::SESSIONS); | 135 model_set.Put(syncer::SESSIONS); |
| 134 model_set.Put(syncer::ARTICLES); | 136 model_set.Put(syncer::ARTICLES); |
| 135 registry->RegisterListPref(prefs::kSyncAcknowledgedSyncTypes, | 137 registry->RegisterListPref(prefs::kSyncAcknowledgedSyncTypes, |
| 136 syncer::ModelTypeSetToValue(model_set), | 138 syncer::ModelTypeSetToValue(model_set), |
| 137 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 139 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 140 |
| 141 registry->RegisterIntegerPref( |
| 142 prefs::kSyncRemainingRollbackTries, 0, |
| 143 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 138 } | 144 } |
| 139 | 145 |
| 140 void SyncPrefs::AddSyncPrefObserver(SyncPrefObserver* sync_pref_observer) { | 146 void SyncPrefs::AddSyncPrefObserver(SyncPrefObserver* sync_pref_observer) { |
| 141 DCHECK(CalledOnValidThread()); | 147 DCHECK(CalledOnValidThread()); |
| 142 sync_pref_observers_.AddObserver(sync_pref_observer); | 148 sync_pref_observers_.AddObserver(sync_pref_observer); |
| 143 } | 149 } |
| 144 | 150 |
| 145 void SyncPrefs::RemoveSyncPrefObserver(SyncPrefObserver* sync_pref_observer) { | 151 void SyncPrefs::RemoveSyncPrefObserver(SyncPrefObserver* sync_pref_observer) { |
| 146 DCHECK(CalledOnValidThread()); | 152 DCHECK(CalledOnValidThread()); |
| 147 sync_pref_observers_.RemoveObserver(sync_pref_observer); | 153 sync_pref_observers_.RemoveObserver(sync_pref_observer); |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 const syncer::ModelTypeSet acknowledged_types = | 364 const syncer::ModelTypeSet acknowledged_types = |
| 359 Union(types, | 365 Union(types, |
| 360 syncer::ModelTypeSetFromValue( | 366 syncer::ModelTypeSetFromValue( |
| 361 *pref_service_->GetList(prefs::kSyncAcknowledgedSyncTypes))); | 367 *pref_service_->GetList(prefs::kSyncAcknowledgedSyncTypes))); |
| 362 | 368 |
| 363 scoped_ptr<base::ListValue> value( | 369 scoped_ptr<base::ListValue> value( |
| 364 syncer::ModelTypeSetToValue(acknowledged_types)); | 370 syncer::ModelTypeSetToValue(acknowledged_types)); |
| 365 pref_service_->Set(prefs::kSyncAcknowledgedSyncTypes, *value); | 371 pref_service_->Set(prefs::kSyncAcknowledgedSyncTypes, *value); |
| 366 } | 372 } |
| 367 | 373 |
| 374 int SyncPrefs::GetRemainingRollbackTries() const { |
| 375 return pref_service_->GetInteger(prefs::kSyncRemainingRollbackTries); |
| 376 } |
| 377 |
| 378 void SyncPrefs::SetRemainingRollbackTries(int times) { |
| 379 pref_service_->SetInteger(prefs::kSyncRemainingRollbackTries, times); |
| 380 } |
| 381 |
| 368 void SyncPrefs::OnSyncManagedPrefChanged() { | 382 void SyncPrefs::OnSyncManagedPrefChanged() { |
| 369 DCHECK(CalledOnValidThread()); | 383 DCHECK(CalledOnValidThread()); |
| 370 FOR_EACH_OBSERVER(SyncPrefObserver, | 384 FOR_EACH_OBSERVER(SyncPrefObserver, |
| 371 sync_pref_observers_, | 385 sync_pref_observers_, |
| 372 OnSyncManagedPrefChange(*pref_sync_managed_)); | 386 OnSyncManagedPrefChange(*pref_sync_managed_)); |
| 373 } | 387 } |
| 374 | 388 |
| 375 void SyncPrefs::SetManagedForTest(bool is_managed) { | 389 void SyncPrefs::SetManagedForTest(bool is_managed) { |
| 376 DCHECK(CalledOnValidThread()); | 390 DCHECK(CalledOnValidThread()); |
| 377 pref_service_->SetBoolean(prefs::kSyncManaged, is_managed); | 391 pref_service_->SetBoolean(prefs::kSyncManaged, is_managed); |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 465 i != pref_groups_.end(); | 479 i != pref_groups_.end(); |
| 466 ++i) { | 480 ++i) { |
| 467 if (types.Has(i->first)) | 481 if (types.Has(i->first)) |
| 468 types_with_groups.PutAll(i->second); | 482 types_with_groups.PutAll(i->second); |
| 469 } | 483 } |
| 470 types_with_groups.RetainAll(registered_types); | 484 types_with_groups.RetainAll(registered_types); |
| 471 return types_with_groups; | 485 return types_with_groups; |
| 472 } | 486 } |
| 473 | 487 |
| 474 } // namespace browser_sync | 488 } // namespace browser_sync |
| OLD | NEW |