| Index: chrome/browser/sync/glue/data_type_manager_impl.h
|
| ===================================================================
|
| --- chrome/browser/sync/glue/data_type_manager_impl.h (revision 94142)
|
| +++ chrome/browser/sync/glue/data_type_manager_impl.h (working copy)
|
| @@ -50,9 +50,8 @@
|
|
|
| // Stops all data types.
|
| void FinishStop();
|
| - void Abort(ConfigureStatus status,
|
| - const tracked_objects::Location& location,
|
| - syncable::ModelType last_attempted_type);
|
| + void FinishStopAndNotify(ConfigureResult result,
|
| + const tracked_objects::Location& location);
|
|
|
| // Returns true if any last_requested_types_ currently needs to start model
|
| // association. If non-null, fills |needs_start| with all such controllers.
|
| @@ -62,7 +61,8 @@
|
| void Restart(sync_api::ConfigureReason reason, bool enable_nigori);
|
| void DownloadReady(bool success);
|
| void NotifyStart();
|
| - void NotifyDone(const ConfigureResult& result);
|
| + void NotifyDone(ConfigureResult result,
|
| + const tracked_objects::Location& location);
|
| void SetBlockedAndNotify();
|
|
|
| // Add to |configure_time_delta_| the time since we last called
|
|
|