| 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/browser_sync/profile_sync_service.h" | 5 #include "components/browser_sync/profile_sync_service.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <cstddef> | 9 #include <cstddef> |
| 10 #include <map> | 10 #include <map> |
| (...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 280 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)); | 280 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)); |
| 281 // TODO(skym): Stop creating leveldb files when signed out. | 281 // TODO(skym): Stop creating leveldb files when signed out. |
| 282 // TODO(skym): Verify using AsUTF8Unsafe is okay here. Should work as long | 282 // TODO(skym): Verify using AsUTF8Unsafe is okay here. Should work as long |
| 283 // as the Local State file is guaranteed to be UTF-8. | 283 // as the Local State file is guaranteed to be UTF-8. |
| 284 device_info_sync_bridge_ = base::MakeUnique<DeviceInfoSyncBridge>( | 284 device_info_sync_bridge_ = base::MakeUnique<DeviceInfoSyncBridge>( |
| 285 local_device_.get(), | 285 local_device_.get(), |
| 286 base::Bind(&ModelTypeStore::CreateStore, syncer::DEVICE_INFO, | 286 base::Bind(&ModelTypeStore::CreateStore, syncer::DEVICE_INFO, |
| 287 sync_data_folder_.Append(base::FilePath(kLevelDBFolderName)) | 287 sync_data_folder_.Append(base::FilePath(kLevelDBFolderName)) |
| 288 .AsUTF8Unsafe(), | 288 .AsUTF8Unsafe(), |
| 289 blocking_task_runner), | 289 blocking_task_runner), |
| 290 base::Bind(&ModelTypeChangeProcessor::Create)); | 290 base::BindRepeating( |
| 291 &ModelTypeChangeProcessor::Create, |
| 292 base::BindRepeating(&syncer::ReportUnrecoverableError, channel_))); |
| 291 } else { | 293 } else { |
| 292 device_info_sync_service_ = | 294 device_info_sync_service_ = |
| 293 base::MakeUnique<DeviceInfoSyncService>(local_device_.get()); | 295 base::MakeUnique<DeviceInfoSyncService>(local_device_.get()); |
| 294 } | 296 } |
| 295 | 297 |
| 296 syncer::SyncApiComponentFactory::RegisterDataTypesMethod | 298 syncer::SyncApiComponentFactory::RegisterDataTypesMethod |
| 297 register_platform_types_callback = | 299 register_platform_types_callback = |
| 298 sync_client_->GetRegisterPlatformTypesCallback(); | 300 sync_client_->GetRegisterPlatformTypesCallback(); |
| 299 sync_client_->GetSyncApiComponentFactory()->RegisterDataTypes( | 301 sync_client_->GetSyncApiComponentFactory()->RegisterDataTypes( |
| 300 this, register_platform_types_callback); | 302 this, register_platform_types_callback); |
| (...skipping 2332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2633 | 2635 |
| 2634 DCHECK(startup_controller_->IsSetupInProgress()); | 2636 DCHECK(startup_controller_->IsSetupInProgress()); |
| 2635 startup_controller_->SetSetupInProgress(false); | 2637 startup_controller_->SetSetupInProgress(false); |
| 2636 | 2638 |
| 2637 if (IsEngineInitialized()) | 2639 if (IsEngineInitialized()) |
| 2638 ReconfigureDatatypeManager(); | 2640 ReconfigureDatatypeManager(); |
| 2639 NotifyObservers(); | 2641 NotifyObservers(); |
| 2640 } | 2642 } |
| 2641 | 2643 |
| 2642 } // namespace browser_sync | 2644 } // namespace browser_sync |
| OLD | NEW |