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 a8fc09ca096f2ba36fe6d5f8f8e988041f13cf12..413526eaab3bea3752c4373e0998a02916e7d710 100644 |
--- a/chrome/browser/sync/glue/non_frontend_data_type_controller.h |
+++ b/chrome/browser/sync/glue/non_frontend_data_type_controller.h |
@@ -20,9 +20,15 @@ |
class Profile; |
class ProfileSyncService; |
class ProfileSyncComponentsFactory; |
+ |
+namespace base { |
+class TimeDelta; |
+} |
+ |
+namespace csync { |
class SyncError; |
+} |
-namespace base { class TimeDelta; } |
namespace browser_sync { |
class AssociatorInterface; |
@@ -95,18 +101,18 @@ class NonFrontendDataTypeController : public DataTypeController { |
// Start failed, make sure we record it, clean up state, and invoke the |
// callback on the frontend thread. |
// Note: this is performed on the datatype's thread. |
- virtual void StartFailed(StartResult result, const SyncError& error); |
+ virtual void StartFailed(StartResult result, const csync::SyncError& error); |
// Start up complete, update the state and invoke the callback. |
// Note: this is performed on the datatype's thread. |
virtual void StartDone(DataTypeController::StartResult result, |
DataTypeController::State new_state, |
- const SyncError& error); |
+ const csync::SyncError& error); |
// UI thread implementation of StartDone. |
virtual void StartDoneImpl(DataTypeController::StartResult result, |
DataTypeController::State new_state, |
- const SyncError& error); |
+ const csync::SyncError& error); |
// Perform any DataType controller specific state cleanup before stopping |
// the datatype controller. The default implementation is a no-op. |