Chromium Code Reviews| Index: sync/internal_api/public/sync_manager.h |
| diff --git a/sync/internal_api/public/sync_manager.h b/sync/internal_api/public/sync_manager.h |
| index 042969716095876d6dcdafb617632995a864b811..a78bc1941903964803c7102a655762b09efcfee0 100644 |
| --- a/sync/internal_api/public/sync_manager.h |
| +++ b/sync/internal_api/public/sync_manager.h |
| @@ -298,7 +298,9 @@ class SyncManager { |
| // function getChildNodeIds(id); |
| virtual void OnInitializationComplete( |
| - const WeakHandle<JsBackend>& js_backend, bool success) = 0; |
| + const WeakHandle<syncer::JsBackend>& js_backend, |
| + bool success, |
| + syncer::ModelTypeSet restored_types) = 0; |
| // We are no longer permitted to communicate with the server. Sync should |
| // be disabled and state cleaned up at once. This can happen for a number |
| @@ -369,9 +371,8 @@ class SyncManager { |
| bool use_ssl, |
| const scoped_refptr<base::TaskRunner>& blocking_task_runner, |
| scoped_ptr<HttpPostProviderFactory> post_factory, |
| - const ModelSafeRoutingInfo& model_safe_routing_info, |
| const std::vector<ModelSafeWorker*>& workers, |
| - ExtensionsActivityMonitor* extensions_activity_monitor, |
| + syncer::ExtensionsActivityMonitor* extensions_activity_monitor, |
|
Nicolas Zea
2012/07/23 20:47:15
remove syncer::
rlarocque
2012/07/23 23:16:10
Done.
|
| ChangeDelegate* change_delegate, |
| const SyncCredentials& credentials, |
| scoped_ptr<SyncNotifier> sync_notifier, |