| 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/base64.h" | 7 #include "base/base64.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| (...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 315 case syncer::SUPERVISED_USER_WHITELISTS: | 315 case syncer::SUPERVISED_USER_WHITELISTS: |
| 316 return prefs::kSyncSupervisedUserWhitelists; | 316 return prefs::kSyncSupervisedUserWhitelists; |
| 317 case syncer::DEVICE_INFO: | 317 case syncer::DEVICE_INFO: |
| 318 return prefs::kSyncDeviceInfo; | 318 return prefs::kSyncDeviceInfo; |
| 319 case syncer::WIFI_CREDENTIALS: | 319 case syncer::WIFI_CREDENTIALS: |
| 320 return prefs::kSyncWifiCredentials; | 320 return prefs::kSyncWifiCredentials; |
| 321 case syncer::ARC_PACKAGE: | 321 case syncer::ARC_PACKAGE: |
| 322 return prefs::kSyncArcPackage; | 322 return prefs::kSyncArcPackage; |
| 323 case syncer::PRINTERS: | 323 case syncer::PRINTERS: |
| 324 return prefs::kSyncPrinters; | 324 return prefs::kSyncPrinters; |
| 325 case syncer::READING_LIST: |
| 326 return prefs::kSyncReadingList; |
| 325 default: | 327 default: |
| 326 break; | 328 break; |
| 327 } | 329 } |
| 328 NOTREACHED() << "Type is " << data_type; | 330 NOTREACHED() << "Type is " << data_type; |
| 329 return NULL; | 331 return NULL; |
| 330 } | 332 } |
| 331 | 333 |
| 332 #if defined(OS_CHROMEOS) | 334 #if defined(OS_CHROMEOS) |
| 333 std::string SyncPrefs::GetSpareBootstrapToken() const { | 335 std::string SyncPrefs::GetSpareBootstrapToken() const { |
| 334 DCHECK(CalledOnValidThread()); | 336 DCHECK(CalledOnValidThread()); |
| (...skipping 15 matching lines...) Expand all Loading... |
| 350 void SyncPrefs::SetManagedForTest(bool is_managed) { | 352 void SyncPrefs::SetManagedForTest(bool is_managed) { |
| 351 DCHECK(CalledOnValidThread()); | 353 DCHECK(CalledOnValidThread()); |
| 352 pref_service_->SetBoolean(prefs::kSyncManaged, is_managed); | 354 pref_service_->SetBoolean(prefs::kSyncManaged, is_managed); |
| 353 } | 355 } |
| 354 | 356 |
| 355 void SyncPrefs::RegisterPrefGroups() { | 357 void SyncPrefs::RegisterPrefGroups() { |
| 356 pref_groups_[syncer::APPS].Put(syncer::APP_NOTIFICATIONS); | 358 pref_groups_[syncer::APPS].Put(syncer::APP_NOTIFICATIONS); |
| 357 pref_groups_[syncer::APPS].Put(syncer::APP_SETTINGS); | 359 pref_groups_[syncer::APPS].Put(syncer::APP_SETTINGS); |
| 358 pref_groups_[syncer::APPS].Put(syncer::APP_LIST); | 360 pref_groups_[syncer::APPS].Put(syncer::APP_LIST); |
| 359 pref_groups_[syncer::APPS].Put(syncer::ARC_PACKAGE); | 361 pref_groups_[syncer::APPS].Put(syncer::ARC_PACKAGE); |
| 362 pref_groups_[syncer::APPS].Put(syncer::READING_LIST); |
| 360 | 363 |
| 361 pref_groups_[syncer::AUTOFILL].Put(syncer::AUTOFILL_PROFILE); | 364 pref_groups_[syncer::AUTOFILL].Put(syncer::AUTOFILL_PROFILE); |
| 362 pref_groups_[syncer::AUTOFILL].Put(syncer::AUTOFILL_WALLET_DATA); | 365 pref_groups_[syncer::AUTOFILL].Put(syncer::AUTOFILL_WALLET_DATA); |
| 363 pref_groups_[syncer::AUTOFILL].Put(syncer::AUTOFILL_WALLET_METADATA); | 366 pref_groups_[syncer::AUTOFILL].Put(syncer::AUTOFILL_WALLET_METADATA); |
| 364 | 367 |
| 365 pref_groups_[syncer::EXTENSIONS].Put(syncer::EXTENSION_SETTINGS); | 368 pref_groups_[syncer::EXTENSIONS].Put(syncer::EXTENSION_SETTINGS); |
| 366 | 369 |
| 367 pref_groups_[syncer::PREFERENCES].Put(syncer::DICTIONARY); | 370 pref_groups_[syncer::PREFERENCES].Put(syncer::DICTIONARY); |
| 368 pref_groups_[syncer::PREFERENCES].Put(syncer::PRIORITY_PREFERENCES); | 371 pref_groups_[syncer::PREFERENCES].Put(syncer::PRIORITY_PREFERENCES); |
| 369 pref_groups_[syncer::PREFERENCES].Put(syncer::SEARCH_ENGINES); | 372 pref_groups_[syncer::PREFERENCES].Put(syncer::SEARCH_ENGINES); |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 549 return std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState>(); | 552 return std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState>(); |
| 550 | 553 |
| 551 std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState> result( | 554 std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState> result( |
| 552 new syncer::SyncEncryptionHandler::NigoriState()); | 555 new syncer::SyncEncryptionHandler::NigoriState()); |
| 553 if (!result->nigori_specifics.ParseFromString(decoded)) | 556 if (!result->nigori_specifics.ParseFromString(decoded)) |
| 554 return std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState>(); | 557 return std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState>(); |
| 555 return result; | 558 return result; |
| 556 } | 559 } |
| 557 | 560 |
| 558 } // namespace sync_driver | 561 } // namespace sync_driver |
| OLD | NEW |