| 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 525 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 536 local_sync_backend_folder.Append(kLoopbackServerBackendFilename); | 536 local_sync_backend_folder.Append(kLoopbackServerBackendFilename); |
| 537 #endif // defined(OS_WIN) | 537 #endif // defined(OS_WIN) |
| 538 | 538 |
| 539 SyncBackendHost::HttpPostProviderFactoryGetter | 539 SyncBackendHost::HttpPostProviderFactoryGetter |
| 540 http_post_provider_factory_getter = | 540 http_post_provider_factory_getter = |
| 541 base::Bind(&syncer::NetworkResources::GetHttpPostProviderFactory, | 541 base::Bind(&syncer::NetworkResources::GetHttpPostProviderFactory, |
| 542 base::Unretained(network_resources_.get()), | 542 base::Unretained(network_resources_.get()), |
| 543 url_request_context_, network_time_update_callback_); | 543 url_request_context_, network_time_update_callback_); |
| 544 | 544 |
| 545 backend_->Initialize( | 545 backend_->Initialize( |
| 546 this, sync_thread_.get(), GetJsEventHandler(), sync_service_url_, | 546 this, sync_thread_->task_runner(), GetJsEventHandler(), sync_service_url_, |
| 547 local_device_->GetSyncUserAgent(), credentials, delete_stale_data, | 547 local_device_->GetSyncUserAgent(), credentials, delete_stale_data, |
| 548 enable_local_sync_backend, local_sync_backend_folder, | 548 enable_local_sync_backend, local_sync_backend_folder, |
| 549 base::MakeUnique<syncer::SyncManagerFactory>(), | 549 base::MakeUnique<syncer::SyncManagerFactory>(), |
| 550 MakeWeakHandle(sync_enabled_weak_factory_.GetWeakPtr()), | 550 MakeWeakHandle(sync_enabled_weak_factory_.GetWeakPtr()), |
| 551 base::Bind(syncer::ReportUnrecoverableError, channel_), | 551 base::Bind(syncer::ReportUnrecoverableError, channel_), |
| 552 http_post_provider_factory_getter, std::move(saved_nigori_state_)); | 552 http_post_provider_factory_getter, std::move(saved_nigori_state_)); |
| 553 } | 553 } |
| 554 | 554 |
| 555 bool ProfileSyncService::IsEncryptedDatatypeEnabled() const { | 555 bool ProfileSyncService::IsEncryptedDatatypeEnabled() const { |
| 556 if (encryption_pending()) | 556 if (encryption_pending()) |
| (...skipping 1977 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2534 | 2534 |
| 2535 DCHECK(startup_controller_->IsSetupInProgress()); | 2535 DCHECK(startup_controller_->IsSetupInProgress()); |
| 2536 startup_controller_->SetSetupInProgress(false); | 2536 startup_controller_->SetSetupInProgress(false); |
| 2537 | 2537 |
| 2538 if (IsBackendInitialized()) | 2538 if (IsBackendInitialized()) |
| 2539 ReconfigureDatatypeManager(); | 2539 ReconfigureDatatypeManager(); |
| 2540 NotifyObservers(); | 2540 NotifyObservers(); |
| 2541 } | 2541 } |
| 2542 | 2542 |
| 2543 } // namespace browser_sync | 2543 } // namespace browser_sync |
| OLD | NEW |