diff options
Diffstat (limited to 'sync/util/cryptographer.h')
| -rw-r--r-- | sync/util/cryptographer.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sync/util/cryptographer.h b/sync/util/cryptographer.h index f68655d..c234952 100644 --- a/sync/util/cryptographer.h +++ b/sync/util/cryptographer.h @@ -65,7 +65,7 @@ class Cryptographer { // set of encrypted types is SensitiveTypes() and that the encrypt // everything flag is false. virtual void OnEncryptedTypesChanged( - syncable::ModelTypeSet encrypted_types, + syncer::ModelTypeSet encrypted_types, bool encrypt_everything) = 0; protected: @@ -181,7 +181,7 @@ class Cryptographer { UpdateResult Update(const sync_pb::NigoriSpecifics& nigori); // The set of types that are always encrypted. - static syncable::ModelTypeSet SensitiveTypes(); + static syncer::ModelTypeSet SensitiveTypes(); // Reset our set of encrypted types based on the contents of the nigori // specifics. @@ -198,11 +198,10 @@ class Cryptographer { bool encrypt_everything() const; // Return the set of encrypted types. - syncable::ModelTypeSet GetEncryptedTypes() const; + syncer::ModelTypeSet GetEncryptedTypes() const; // Forwards to MergeEncryptedTypes. - void MergeEncryptedTypesForTest( - syncable::ModelTypeSet encrypted_types); + void MergeEncryptedTypesForTest(syncer::ModelTypeSet encrypted_types); private: FRIEND_TEST_ALL_PREFIXES(SyncCryptographerTest, PackUnpack); @@ -210,7 +209,7 @@ class Cryptographer { // Merges the given set of encrypted types with the existing set and emits a // notification if necessary. - void MergeEncryptedTypes(syncable::ModelTypeSet encrypted_types); + void MergeEncryptedTypes(syncer::ModelTypeSet encrypted_types); void EmitEncryptedTypesChangedNotification(); @@ -242,7 +241,7 @@ class Cryptographer { scoped_ptr<sync_pb::EncryptedData> pending_keys_; - syncable::ModelTypeSet encrypted_types_; + syncer::ModelTypeSet encrypted_types_; bool encrypt_everything_; DISALLOW_COPY_AND_ASSIGN(Cryptographer); |