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

Unified Diff: components/sync/driver/data_type_status_table.h

Issue 2388673002: Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co (Closed)
Patch Set: Created 4 years, 2 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
Index: components/sync/driver/data_type_status_table.h
diff --git a/components/sync/driver/data_type_status_table.h b/components/sync/driver/data_type_status_table.h
index eebc8281b922dffbdf39ac1150b9612e71286fe0..ef0655c7b35d93fa5533e1e9e5f15542f70bdefe 100644
--- a/components/sync/driver/data_type_status_table.h
+++ b/components/sync/driver/data_type_status_table.h
@@ -11,12 +11,12 @@
#include "components/sync/api/sync_error.h"
#include "components/sync/base/model_type.h"
-namespace syncer {
+namespace sync_driver {
// Class to keep track of data types that have encountered an error during sync.
class DataTypeStatusTable {
public:
- typedef std::map<ModelType, SyncError> TypeErrorMap;
+ typedef std::map<syncer::ModelType, syncer::SyncError> TypeErrorMap;
DataTypeStatusTable();
DataTypeStatusTable(const DataTypeStatusTable& other);
@@ -35,42 +35,42 @@ class DataTypeStatusTable {
void ResetCryptoErrors();
// Resets those persistence errors that intersect with |purged_types|.
- void ResetPersistenceErrorsFrom(ModelTypeSet purged_types);
+ void ResetPersistenceErrorsFrom(syncer::ModelTypeSet purged_types);
// Removes |type| from the data_type_errors_ set. Returns true if the type
// was removed from the error set, false if the type did not have a data type
// error to begin with.
- bool ResetDataTypeErrorFor(ModelType type);
+ bool ResetDataTypeErrorFor(syncer::ModelType type);
// Removes |type| from the unread_errors_ set. Returns true if the type
// was removed from the error set, false if the type did not have an unready
// error to begin with.
- bool ResetUnreadyErrorFor(ModelType type);
+ bool ResetUnreadyErrorFor(syncer::ModelType type);
// Returns a list of all the errors this class has recorded.
TypeErrorMap GetAllErrors() const;
// Returns all types with failure errors. This includes, fatal, crypto, and
// unready types.`
- ModelTypeSet GetFailedTypes() const;
+ syncer::ModelTypeSet GetFailedTypes() const;
// Returns the types that are failing due to unrecoverable or datatype errors.
- ModelTypeSet GetFatalErrorTypes() const;
+ syncer::ModelTypeSet GetFatalErrorTypes() const;
// Returns the types that are failing due to cryptographer errors.
- ModelTypeSet GetCryptoErrorTypes() const;
+ syncer::ModelTypeSet GetCryptoErrorTypes() const;
// Returns the types that are failing due to persistence errors.
- ModelTypeSet GetPersistenceErrorTypes() const;
+ syncer::ModelTypeSet GetPersistenceErrorTypes() const;
// Returns the types that cannot be configured due to not being ready.
- ModelTypeSet GetUnreadyErrorTypes() const;
+ syncer::ModelTypeSet GetUnreadyErrorTypes() const;
// Returns the types that triggered the unrecoverable error.
- ModelTypeSet GetUnrecoverableErrorTypes() const;
+ syncer::ModelTypeSet GetUnrecoverableErrorTypes() const;
// Returns the current unrecoverable error, if there is one.
- SyncError GetUnrecoverableError() const;
+ syncer::SyncError GetUnrecoverableError() const;
private:
// The current unrecoverable errors. Only one unrecoverable error can be
@@ -94,6 +94,6 @@ class DataTypeStatusTable {
TypeErrorMap unready_errors_;
};
-} // namespace syncer
+} // namespace sync_driver
#endif // COMPONENTS_SYNC_DRIVER_DATA_TYPE_STATUS_TABLE_H_
« no previous file with comments | « components/sync/driver/data_type_manager_observer.h ('k') | components/sync/driver/data_type_status_table.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698