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

Unified Diff: chrome/browser/sync/syncable/model_type.h

Issue 8919021: [Sync] Rename ModelEnumSet to ModelTypeSet (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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: chrome/browser/sync/syncable/model_type.h
diff --git a/chrome/browser/sync/syncable/model_type.h b/chrome/browser/sync/syncable/model_type.h
index a532e02d4b77843c8fda11bc431c29adb6ed178f..0573ac89e3635d49d8ccf611c6b2c0ee0f73c68a 100644
--- a/chrome/browser/sync/syncable/model_type.h
+++ b/chrome/browser/sync/syncable/model_type.h
@@ -86,9 +86,9 @@ enum ModelType {
};
typedef browser_sync::EnumSet<
- ModelType, FIRST_REAL_MODEL_TYPE, LAST_REAL_MODEL_TYPE> ModelEnumSet;
+ ModelType, FIRST_REAL_MODEL_TYPE, LAST_REAL_MODEL_TYPE> ModelTypeSet;
typedef browser_sync::EnumSet<
- ModelType, UNSPECIFIED, LAST_REAL_MODEL_TYPE> FullModelEnumSet;
+ ModelType, UNSPECIFIED, LAST_REAL_MODEL_TYPE> FullModelTypeSet;
inline ModelType ModelTypeFromInt(int i) {
DCHECK_GE(i, 0);
@@ -139,12 +139,12 @@ ModelType ModelTypeFromValue(const base::Value& value);
// Returns the ModelType corresponding to the name |model_type_string|.
ModelType ModelTypeFromString(const std::string& model_type_string);
-std::string ModelEnumSetToString(ModelEnumSet model_types);
+std::string ModelTypeSetToString(ModelTypeSet model_types);
// Caller takes ownership of returned list.
-base::ListValue* ModelEnumSetToValue(ModelEnumSet model_types);
+base::ListValue* ModelTypeSetToValue(ModelTypeSet model_types);
-ModelEnumSet ModelEnumSetFromValue(const base::ListValue& value);
+ModelTypeSet ModelTypeSetFromValue(const base::ListValue& value);
// Returns a string corresponding to the syncable tag for this datatype.
std::string ModelTypeToRootTag(ModelType type);
« no previous file with comments | « chrome/browser/sync/syncable/directory_change_delegate.h ('k') | chrome/browser/sync/syncable/model_type.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698