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/logging.h" | 7 #include "base/logging.h" |
8 #include "base/prefs/pref_member.h" | 8 #include "base/prefs/pref_member.h" |
9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 model_set.Put(syncer::AUTOFILL); | 130 model_set.Put(syncer::AUTOFILL); |
131 model_set.Put(syncer::THEMES); | 131 model_set.Put(syncer::THEMES); |
132 model_set.Put(syncer::EXTENSIONS); | 132 model_set.Put(syncer::EXTENSIONS); |
133 model_set.Put(syncer::NIGORI); | 133 model_set.Put(syncer::NIGORI); |
134 model_set.Put(syncer::SEARCH_ENGINES); | 134 model_set.Put(syncer::SEARCH_ENGINES); |
135 model_set.Put(syncer::APPS); | 135 model_set.Put(syncer::APPS); |
136 model_set.Put(syncer::APP_LIST); | 136 model_set.Put(syncer::APP_LIST); |
137 model_set.Put(syncer::TYPED_URLS); | 137 model_set.Put(syncer::TYPED_URLS); |
138 model_set.Put(syncer::SESSIONS); | 138 model_set.Put(syncer::SESSIONS); |
139 model_set.Put(syncer::ARTICLES); | 139 model_set.Put(syncer::ARTICLES); |
| 140 model_set.Put(syncer::WIFI_CREDENTIALS); |
140 registry->RegisterListPref(prefs::kSyncAcknowledgedSyncTypes, | 141 registry->RegisterListPref(prefs::kSyncAcknowledgedSyncTypes, |
141 syncer::ModelTypeSetToValue(model_set), | 142 syncer::ModelTypeSetToValue(model_set), |
142 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 143 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
143 | 144 |
144 registry->RegisterIntegerPref( | 145 registry->RegisterIntegerPref( |
145 prefs::kSyncRemainingRollbackTries, 0, | 146 prefs::kSyncRemainingRollbackTries, 0, |
146 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 147 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
147 } | 148 } |
148 | 149 |
149 void SyncPrefs::AddSyncPrefObserver(SyncPrefObserver* sync_pref_observer) { | 150 void SyncPrefs::AddSyncPrefObserver(SyncPrefObserver* sync_pref_observer) { |
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
336 case syncer::PRIORITY_PREFERENCES: | 337 case syncer::PRIORITY_PREFERENCES: |
337 return prefs::kSyncPriorityPreferences; | 338 return prefs::kSyncPriorityPreferences; |
338 case syncer::SUPERVISED_USERS: | 339 case syncer::SUPERVISED_USERS: |
339 return prefs::kSyncSupervisedUsers; | 340 return prefs::kSyncSupervisedUsers; |
340 case syncer::ARTICLES: | 341 case syncer::ARTICLES: |
341 return prefs::kSyncArticles; | 342 return prefs::kSyncArticles; |
342 case syncer::SUPERVISED_USER_SHARED_SETTINGS: | 343 case syncer::SUPERVISED_USER_SHARED_SETTINGS: |
343 return prefs::kSyncSupervisedUserSharedSettings; | 344 return prefs::kSyncSupervisedUserSharedSettings; |
344 case syncer::DEVICE_INFO: | 345 case syncer::DEVICE_INFO: |
345 return prefs::kSyncDeviceInfo; | 346 return prefs::kSyncDeviceInfo; |
| 347 case syncer::WIFI_CREDENTIALS: |
| 348 return prefs::kSyncWifiCredentials; |
346 default: | 349 default: |
347 break; | 350 break; |
348 } | 351 } |
349 NOTREACHED(); | 352 NOTREACHED(); |
350 return NULL; | 353 return NULL; |
351 } | 354 } |
352 | 355 |
353 #if defined(OS_CHROMEOS) | 356 #if defined(OS_CHROMEOS) |
354 std::string SyncPrefs::GetSpareBootstrapToken() const { | 357 std::string SyncPrefs::GetSpareBootstrapToken() const { |
355 DCHECK(CalledOnValidThread()); | 358 DCHECK(CalledOnValidThread()); |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
495 | 498 |
496 void SyncPrefs::SetFirstSyncTime(base::Time time) { | 499 void SyncPrefs::SetFirstSyncTime(base::Time time) { |
497 pref_service_->SetInt64(prefs::kSyncFirstSyncTime, time.ToInternalValue()); | 500 pref_service_->SetInt64(prefs::kSyncFirstSyncTime, time.ToInternalValue()); |
498 } | 501 } |
499 | 502 |
500 void SyncPrefs::ClearFirstSyncTime() { | 503 void SyncPrefs::ClearFirstSyncTime() { |
501 pref_service_->ClearPref(prefs::kSyncFirstSyncTime); | 504 pref_service_->ClearPref(prefs::kSyncFirstSyncTime); |
502 } | 505 } |
503 | 506 |
504 } // namespace sync_driver | 507 } // namespace sync_driver |
OLD | NEW |