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

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

Issue 2388163002: [Sync] Move //components/sync to the syncer namespace, take 2. (Closed)
Patch Set: Rebase. 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
« no previous file with comments | « components/sync/driver/data_type_encryption_handler.cc ('k') | components/sync/driver/data_type_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/driver/data_type_manager.h
diff --git a/components/sync/driver/data_type_manager.h b/components/sync/driver/data_type_manager.h
index ecf2c67479e12b2392f744c6ea75b7f41616238d..92f310d172bb9dc081f77802bce5f89b6d740f96 100644
--- a/components/sync/driver/data_type_manager.h
+++ b/components/sync/driver/data_type_manager.h
@@ -15,7 +15,7 @@
#include "components/sync/driver/data_type_controller.h"
#include "components/sync/driver/data_type_status_table.h"
-namespace sync_driver {
+namespace syncer {
// This interface is for managing the start up and shut down life cycle
// of many different syncable data types.
@@ -43,13 +43,12 @@ class DataTypeManager {
// Note: |errors| is only filled when status is not OK.
struct ConfigureResult {
ConfigureResult();
- ConfigureResult(ConfigureStatus status,
- syncer::ModelTypeSet requested_types);
+ ConfigureResult(ConfigureStatus status, ModelTypeSet requested_types);
ConfigureResult(const ConfigureResult& other);
~ConfigureResult();
ConfigureStatus status;
- syncer::ModelTypeSet requested_types;
+ ModelTypeSet requested_types;
DataTypeStatusTable data_type_status_table;
};
@@ -70,18 +69,18 @@ class DataTypeManager {
// Note that you may call Configure() while configuration is in
// progress. Configuration will be complete only when the
// desired_types supplied in the last call to Configure is achieved.
- virtual void Configure(syncer::ModelTypeSet desired_types,
- syncer::ConfigureReason reason) = 0;
+ virtual void Configure(ModelTypeSet desired_types,
+ ConfigureReason reason) = 0;
// Resets the error state for |type| and triggers a reconfiguration if
// necessary.
- virtual void ReenableType(syncer::ModelType type) = 0;
+ virtual void ReenableType(ModelType type) = 0;
// Resets all data type error state.
virtual void ResetDataTypeErrors() = 0;
- virtual void PurgeForMigration(syncer::ModelTypeSet undesired_types,
- syncer::ConfigureReason reason) = 0;
+ virtual void PurgeForMigration(ModelTypeSet undesired_types,
+ ConfigureReason reason) = 0;
// Synchronously stops all registered data types. If called after
// Configure() is called but before it finishes, it will abort the
@@ -93,6 +92,6 @@ class DataTypeManager {
virtual State state() const = 0;
};
-} // namespace sync_driver
+} // namespace syncer
#endif // COMPONENTS_SYNC_DRIVER_DATA_TYPE_MANAGER_H__
« no previous file with comments | « components/sync/driver/data_type_encryption_handler.cc ('k') | components/sync/driver/data_type_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698