| Index: chrome/browser/sync/glue/non_frontend_data_type_controller.h
|
| diff --git a/chrome/browser/sync/glue/non_frontend_data_type_controller.h b/chrome/browser/sync/glue/non_frontend_data_type_controller.h
|
| index 41f3fcf5e454136e5187ce06a99f258ea669e7e9..e2e5043f91d7b9fd35c19f88be8f1c341666dbfb 100644
|
| --- a/chrome/browser/sync/glue/non_frontend_data_type_controller.h
|
| +++ b/chrome/browser/sync/glue/non_frontend_data_type_controller.h
|
| @@ -68,9 +68,8 @@ class NonFrontendDataTypeController : public sync_driver::DataTypeController {
|
|
|
| // DataTypeErrorHandler interface.
|
| // Note: this is performed on the datatype's thread.
|
| - virtual void OnSingleDatatypeUnrecoverableError(
|
| - const tracked_objects::Location& from_here,
|
| - const std::string& message) OVERRIDE;
|
| + virtual void OnSingleDataTypeUnrecoverableError(
|
| + const syncer::SyncError& error) OVERRIDE;
|
|
|
| // Callback to receive background association results.
|
| struct AssociationResult {
|
| @@ -147,8 +146,7 @@ class NonFrontendDataTypeController : public sync_driver::DataTypeController {
|
|
|
| // The actual implementation of Disabling the datatype. This happens
|
| // on the UI thread.
|
| - virtual void DisableImpl(const tracked_objects::Location& from_here,
|
| - const std::string& message);
|
| + virtual void DisableImpl(const syncer::SyncError& error);
|
|
|
| // Record association time. Called on Datatype's thread.
|
| virtual void RecordAssociationTime(base::TimeDelta time);
|
|
|