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

Unified Diff: chrome/browser/sync/engine/nigori_util.cc

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
« no previous file with comments | « chrome/browser/sync/engine/nigori_util.h ('k') | chrome/browser/sync/engine/nigori_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/nigori_util.cc
diff --git a/chrome/browser/sync/engine/nigori_util.cc b/chrome/browser/sync/engine/nigori_util.cc
index 9b089ecf162b10a0487f67fab300bb12ddc505c6..f8a26a9f4e5b127dc8bfa0e59309649cc2119ef2 100644
--- a/chrome/browser/sync/engine/nigori_util.cc
+++ b/chrome/browser/sync/engine/nigori_util.cc
@@ -38,7 +38,7 @@ bool ProcessUnsyncedChangesForEncryption(
bool VerifyUnsyncedChangesAreEncrypted(
BaseTransaction* const trans,
- ModelEnumSet encrypted_types) {
+ ModelTypeSet encrypted_types) {
std::vector<int64> handles;
browser_sync::SyncerUtil::GetUnsyncedEntries(trans, &handles);
for (size_t i = 0; i < handles.size(); ++i) {
@@ -53,7 +53,7 @@ bool VerifyUnsyncedChangesAreEncrypted(
return true;
}
-bool EntryNeedsEncryption(ModelEnumSet encrypted_types,
+bool EntryNeedsEncryption(ModelTypeSet encrypted_types,
const Entry& entry) {
if (!entry.Get(UNIQUE_SERVER_TAG).empty())
return false; // We don't encrypt unique server nodes.
@@ -68,7 +68,7 @@ bool EntryNeedsEncryption(ModelEnumSet encrypted_types,
entry.Get(NON_UNIQUE_NAME) != kEncryptedString);
}
-bool SpecificsNeedsEncryption(ModelEnumSet encrypted_types,
+bool SpecificsNeedsEncryption(ModelTypeSet encrypted_types,
const sync_pb::EntitySpecifics& specifics) {
const ModelType type = GetModelTypeFromSpecifics(specifics);
if (type == PASSWORDS || type == NIGORI)
« no previous file with comments | « chrome/browser/sync/engine/nigori_util.h ('k') | chrome/browser/sync/engine/nigori_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698