| 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 "build/build_config.h" | 5 #include "build/build_config.h" |
| 6 | 6 |
| 7 #include "chrome/browser/sync/glue/sync_backend_host.h" | 7 #include "chrome/browser/sync/glue/sync_backend_host.h" |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <map> | 10 #include <map> |
| (...skipping 1254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1265 | 1265 |
| 1266 void SyncBackendHost::Core::DoFinishConfigureDataTypes( | 1266 void SyncBackendHost::Core::DoFinishConfigureDataTypes( |
| 1267 syncer::ModelTypeSet types_to_config, | 1267 syncer::ModelTypeSet types_to_config, |
| 1268 const base::Callback<void(syncer::ModelTypeSet)>& ready_task) { | 1268 const base::Callback<void(syncer::ModelTypeSet)>& ready_task) { |
| 1269 DCHECK_EQ(MessageLoop::current(), sync_loop_); | 1269 DCHECK_EQ(MessageLoop::current(), sync_loop_); |
| 1270 | 1270 |
| 1271 // Update the enabled types for the bridge and sync manager. | 1271 // Update the enabled types for the bridge and sync manager. |
| 1272 syncer::ModelSafeRoutingInfo routing_info; | 1272 syncer::ModelSafeRoutingInfo routing_info; |
| 1273 registrar_->GetModelSafeRoutingInfo(&routing_info); | 1273 registrar_->GetModelSafeRoutingInfo(&routing_info); |
| 1274 const syncer::ModelTypeSet enabled_types = GetRoutingInfoTypes(routing_info); | 1274 const syncer::ModelTypeSet enabled_types = GetRoutingInfoTypes(routing_info); |
| 1275 chrome_sync_notification_bridge_->UpdateEnabledTypes(enabled_types); | |
| 1276 sync_manager_->UpdateEnabledTypes(enabled_types); | 1275 sync_manager_->UpdateEnabledTypes(enabled_types); |
| 1277 | 1276 |
| 1278 const syncer::ModelTypeSet failed_configuration_types = | 1277 const syncer::ModelTypeSet failed_configuration_types = |
| 1279 Difference(types_to_config, sync_manager_->InitialSyncEndedTypes()); | 1278 Difference(types_to_config, sync_manager_->InitialSyncEndedTypes()); |
| 1280 host_.Call(FROM_HERE, | 1279 host_.Call(FROM_HERE, |
| 1281 &SyncBackendHost::FinishConfigureDataTypesOnFrontendLoop, | 1280 &SyncBackendHost::FinishConfigureDataTypesOnFrontendLoop, |
| 1282 failed_configuration_types, | 1281 failed_configuration_types, |
| 1283 ready_task); | 1282 ready_task); |
| 1284 } | 1283 } |
| 1285 | 1284 |
| (...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1562 const syncer::ModelTypeSet failed_configuration_types) { | 1561 const syncer::ModelTypeSet failed_configuration_types) { |
| 1563 HandleInitializationCompletedOnFrontendLoop( | 1562 HandleInitializationCompletedOnFrontendLoop( |
| 1564 failed_configuration_types.Empty()); | 1563 failed_configuration_types.Empty()); |
| 1565 } | 1564 } |
| 1566 | 1565 |
| 1567 #undef SDVLOG | 1566 #undef SDVLOG |
| 1568 | 1567 |
| 1569 #undef SLOG | 1568 #undef SLOG |
| 1570 | 1569 |
| 1571 } // namespace browser_sync | 1570 } // namespace browser_sync |
| OLD | NEW |