Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8812)

Unified Diff: chrome/browser/sync/glue/data_type_controller.h

Issue 10662035: [Sync] Put everything in sync/api into csync namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix comments Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/glue/change_processor_mock.h ('k') | chrome/browser/sync/glue/data_type_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/data_type_controller.h
diff --git a/chrome/browser/sync/glue/data_type_controller.h b/chrome/browser/sync/glue/data_type_controller.h
index a8c2e957646524a21a5a06d6bc8f196585ed61a4..8c6a89742f5d4391b33dfcdd5e4f14d242ca35c8 100644
--- a/chrome/browser/sync/glue/data_type_controller.h
+++ b/chrome/browser/sync/glue/data_type_controller.h
@@ -18,7 +18,9 @@
#include "sync/internal_api/public/syncable/model_type.h"
#include "sync/internal_api/public/util/unrecoverable_error_handler.h"
+namespace csync {
class SyncError;
+}
namespace browser_sync {
@@ -61,10 +63,11 @@ class DataTypeController
MAX_START_RESULT
};
- typedef base::Callback<void(StartResult, const SyncError&)> StartCallback;
+ typedef base::Callback<void(StartResult,
+ const csync::SyncError&)> StartCallback;
typedef base::Callback<void(syncable::ModelType,
- SyncError)> ModelLoadCallback;
+ csync::SyncError)> ModelLoadCallback;
typedef std::map<syncable::ModelType,
scoped_refptr<DataTypeController> > TypeMap;
@@ -107,7 +110,7 @@ class DataTypeController
// Partial implementation of DataTypeErrorHandler.
// This is thread safe.
- virtual SyncError CreateAndUploadError(
+ virtual csync::SyncError CreateAndUploadError(
const tracked_objects::Location& location,
const std::string& message,
syncable::ModelType type) OVERRIDE;
« no previous file with comments | « chrome/browser/sync/glue/change_processor_mock.h ('k') | chrome/browser/sync/glue/data_type_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698