| Index: components/browser_sync/browser/profile_sync_service.cc
|
| diff --git a/components/browser_sync/browser/profile_sync_service.cc b/components/browser_sync/browser/profile_sync_service.cc
|
| index a23b37b70282cccb5645fae0277583df6e174878..bc5323b600ef6d6c9c309c9be0aee97ed423fe20 100644
|
| --- a/components/browser_sync/browser/profile_sync_service.cc
|
| +++ b/components/browser_sync/browser/profile_sync_service.cc
|
| @@ -61,6 +61,7 @@
|
| #include "components/sync/driver/backend_migrator.h"
|
| #include "components/sync/driver/change_processor.h"
|
| #include "components/sync/driver/data_type_controller.h"
|
| +#include "components/sync/driver/directory_data_type_controller.h"
|
| #include "components/sync/driver/glue/chrome_report_unrecoverable_error.h"
|
| #include "components/sync/driver/glue/sync_backend_host.h"
|
| #include "components/sync/driver/glue/sync_backend_host_impl.h"
|
| @@ -81,6 +82,7 @@
|
| #include "components/sync/js/js_event_details.h"
|
| #include "components/sync/protocol/sync.pb.h"
|
| #include "components/sync/syncable/directory.h"
|
| +#include "components/sync/syncable/syncable_read_transaction.h"
|
| #include "components/sync_sessions/favicon_cache.h"
|
| #include "components/sync_sessions/session_data_type_controller.h"
|
| #include "components/sync_sessions/sessions_sync_manager.h"
|
| @@ -2283,8 +2285,8 @@ void ProfileSyncService::GetAllNodes(
|
| }
|
| helper->OnReceivedNodesForTypes(type_vector, std::move(empty_results));
|
| } else {
|
| - backend_->GetAllNodesForTypes(
|
| - all_types,
|
| + GetAllNodesForTypes(
|
| + all_types, base::ThreadTaskRunnerHandle::Get(),
|
| base::Bind(&GetAllNodesRequestHelper::OnReceivedNodesForTypes, helper));
|
| }
|
| }
|
| @@ -2540,3 +2542,31 @@ void ProfileSyncService::OnSetupInProgressHandleDestroyed() {
|
| ReconfigureDatatypeManager();
|
| NotifyObservers();
|
| }
|
| +
|
| +void ProfileSyncService::GetAllNodesForTypes(
|
| + syncer::ModelTypeSet types,
|
| + scoped_refptr<base::SequencedTaskRunner> task_runner,
|
| + base::Callback<void(const std::vector<syncer::ModelType>& type,
|
| + ScopedVector<base::ListValue>)> callback) {
|
| + std::vector<syncer::ModelType> types_vector;
|
| + ScopedVector<base::ListValue> node_lists;
|
| +
|
| + for (syncer::ModelTypeSet::Iterator it = types.First(); it.Good(); it.Inc()) {
|
| + DataTypeController::TypeMap::const_iterator iter =
|
| + data_type_controllers_.find(it.Get());
|
| + if (iter != data_type_controllers_.end()) {
|
| + iter->second->GetAllNodes(base::ThreadTaskRunnerHandle::Get(), callback);
|
| + } else {
|
| + // Control Types
|
| + types_vector.push_back(it.Get());
|
| + node_lists.push_back(sync_driver::DirectoryDataTypeController::
|
| + GetAllNodesForTypeFromDirectory(
|
| + it.Get(), GetUserShare()->directory.get())
|
| + .release());
|
| + }
|
| + }
|
| +
|
| + if (!types_vector.empty()) {
|
| + callback.Run(types_vector, std::move(node_lists));
|
| + }
|
| +}
|
|
|