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..921e5fab959286391b8c001000fe03abc2827aaa 100644 |
--- a/components/sync_driver/non_blocking_data_type_controller.h |
+++ b/components/sync_driver/non_blocking_data_type_controller.h |
@@ -16,6 +16,8 @@ class SyncClient; |
namespace syncer_v2 { |
struct ActivationContext; |
+class ModelTypeChangeProcessor; |
skym
2016/03/22 15:56:26
Looks like you didn't need these.
Gang Wu
2016/03/22 17:47:51
Done.
skym
2016/03/22 19:02:06
You don't need ModelTypeService either, I think.
Gang Wu
2016/03/24 15:56:25
Done.
|
+class ModelTypeService; |
class SharedModelTypeProcessor; |
} |
@@ -78,15 +80,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 +104,9 @@ class NonBlockingDataTypeController : public sync_driver::DataTypeController { |
syncer::SyncError error, |
scoped_ptr<syncer_v2::ActivationContext> activation_context); |
+ // The function will do the work on model thread for function LoadModels(). |
skym
2016/03/22 15:56:26
What does this mean? What is 'function LoadModels(
Gang Wu
2016/03/22 17:47:50
better?
|
+ void LoadModelsOnModelThread(); |
+ |
// Model Type for this controller |
syncer::ModelType model_type_; |