| Index: components/sync_driver/non_blocking_data_type_controller.h
|
| diff --git a/components/sync_driver/non_blocking_data_type_controller.h b/components/sync_driver/non_blocking_data_type_controller.h
|
| index d7369ac4a3a39c6b3275f96466e2e863c64ee17c..fc4dccca8b3bc6451a6ee667352bed9d2685735e 100644
|
| --- a/components/sync_driver/non_blocking_data_type_controller.h
|
| +++ b/components/sync_driver/non_blocking_data_type_controller.h
|
| @@ -78,15 +78,11 @@ class NonBlockingDataTypeController : public sync_driver::DataTypeController {
|
| virtual void RunOnUIThread(const tracked_objects::Location& from_here,
|
| const base::Closure& task) = 0;
|
|
|
| - // The function will create SharedModelTypeProcessor on model thread.
|
| - void InitializeProcessor();
|
| -
|
| private:
|
| void RecordStartFailure(ConfigureResult result) const;
|
| void RecordUnrecoverableError();
|
| void ReportLoadModelError(ConfigureResult result,
|
| const syncer::SyncError& error);
|
| - void InitializeProcessorOnModelThread();
|
|
|
| // If the DataType controller is waiting for models to load, once the models
|
| // are loaded this function should be called to let the base class
|
| @@ -106,6 +102,10 @@ class NonBlockingDataTypeController : public sync_driver::DataTypeController {
|
| syncer::SyncError error,
|
| scoped_ptr<syncer_v2::ActivationContext> activation_context);
|
|
|
| + // The function LoadModels() will call this function to do some works which
|
| + // need to be done on model thread.
|
| + void LoadModelsOnModelThread();
|
| +
|
| // Model Type for this controller
|
| syncer::ModelType model_type_;
|
|
|
| @@ -122,6 +122,9 @@ class NonBlockingDataTypeController : public sync_driver::DataTypeController {
|
| // callback and must temporarily own it until ActivateDataType is called.
|
| scoped_ptr<syncer_v2::ActivationContext> activation_context_;
|
|
|
| + // TODO(gangwu): We can complete remove holding this pointer since the only
|
| + // place we use it is when we stop the data type. We can let ModelTypeService
|
| + // to stop the processor.
|
| // A weak pointer to the actual SharedModelTypeProcessor
|
| base::WeakPtr<syncer_v2::SharedModelTypeProcessor> type_processor_;
|
|
|
|
|