| Index: trunk/src/components/sync_driver/ui_data_type_controller.h
|
| ===================================================================
|
| --- trunk/src/components/sync_driver/ui_data_type_controller.h (revision 289354)
|
| +++ trunk/src/components/sync_driver/ui_data_type_controller.h (working copy)
|
| @@ -34,7 +34,6 @@
|
| UIDataTypeController(
|
| scoped_refptr<base::MessageLoopProxy> ui_thread,
|
| const base::Closure& error_callback,
|
| - const DisableTypeCallback& disable_callback,
|
| syncer::ModelType type,
|
| SyncApiComponentFactory* sync_factory);
|
|
|
| @@ -50,9 +49,8 @@
|
| virtual State state() const OVERRIDE;
|
|
|
| // DataTypeErrorHandler interface.
|
| - virtual void OnSingleDatatypeUnrecoverableError(
|
| - const tracked_objects::Location& from_here,
|
| - const std::string& message) OVERRIDE;
|
| + virtual void OnSingleDataTypeUnrecoverableError(
|
| + const syncer::SyncError& error) OVERRIDE;
|
|
|
| // Used by tests to override the factory used to create
|
| // GenericChangeProcessors.
|
|
|