Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(711)

Unified Diff: components/sync_driver/data_type_manager_impl.cc

Issue 1848793006: [Sync] Register USS types with ModelTypeRegistry before download (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/sync_driver/data_type_manager_impl.cc
diff --git a/components/sync_driver/data_type_manager_impl.cc b/components/sync_driver/data_type_manager_impl.cc
index 69f508d9e65ed1e3e47112b15005931d24d82f2e..04db85e942e84fc8eed53dcf762612fc1d461842 100644
--- a/components/sync_driver/data_type_manager_impl.cc
+++ b/components/sync_driver/data_type_manager_impl.cc
@@ -172,6 +172,16 @@ void DataTypeManagerImpl::ConfigureImpl(
Restart(reason);
}
+void DataTypeManagerImpl::RegisterTypesWithBackend() {
+ for (syncer::ModelTypeSet::Iterator type_iter = last_requested_types_.First();
+ type_iter.Good(); type_iter.Inc()) {
+ const auto dtc_iter = controllers_->find(type_iter.Get());
+ if (dtc_iter == controllers_->end())
+ continue;
skym 2016/04/01 21:58:21 Why bother with continue? Why not just if (dt
pavely 2016/04/04 17:57:16 Sorry, work-in-progress version had more code afte
+ dtc_iter->second->RegisterWithBackend(configurer_);
+ }
+}
+
BackendDataTypeConfigurer::DataTypeConfigStateMap
DataTypeManagerImpl::BuildDataTypeConfigStateMap(
const syncer::ModelTypeSet& types_being_configured) const {
@@ -312,6 +322,7 @@ void DataTypeManagerImpl::OnAllDataTypesReadyForConfigure() {
// TODO(pavely): By now some of datatypes in download_types_queue_ could have
// failed loading and should be excluded from configuration. I need to adjust
// download_types_queue_ for such types.
+ RegisterTypesWithBackend();
StartNextDownload(syncer::ModelTypeSet());
}

Powered by Google App Engine
This is Rietveld 408576698