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

Unified Diff: sync/util/cryptographer.h

Issue 10795018: [Sync] Remove unneeded 'using syncer::' lines and 'syncer::' scopings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fiix indent Created 8 years, 5 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 | « sync/tools/sync_listen_notifications.cc ('k') | sync/util/cryptographer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/util/cryptographer.h
diff --git a/sync/util/cryptographer.h b/sync/util/cryptographer.h
index b6f99af78c1565ec70cc189ce4989bc1fff5dada..f02875a41e69fdbcc5fbc22a8ce4a1d747309f9e 100644
--- a/sync/util/cryptographer.h
+++ b/sync/util/cryptographer.h
@@ -64,7 +64,7 @@ class Cryptographer {
// set of encrypted types is SensitiveTypes() and that the encrypt
// everything flag is false.
virtual void OnEncryptedTypesChanged(
- syncer::ModelTypeSet encrypted_types,
+ ModelTypeSet encrypted_types,
bool encrypt_everything) = 0;
protected:
@@ -180,7 +180,7 @@ class Cryptographer {
UpdateResult Update(const sync_pb::NigoriSpecifics& nigori);
// The set of types that are always encrypted.
- static syncer::ModelTypeSet SensitiveTypes();
+ static ModelTypeSet SensitiveTypes();
// Reset our set of encrypted types based on the contents of the nigori
// specifics.
@@ -197,10 +197,10 @@ class Cryptographer {
bool encrypt_everything() const;
// Return the set of encrypted types.
- syncer::ModelTypeSet GetEncryptedTypes() const;
+ ModelTypeSet GetEncryptedTypes() const;
// Forwards to MergeEncryptedTypes.
- void MergeEncryptedTypesForTest(syncer::ModelTypeSet encrypted_types);
+ void MergeEncryptedTypesForTest(ModelTypeSet encrypted_types);
private:
FRIEND_TEST_ALL_PREFIXES(SyncCryptographerTest, PackUnpack);
@@ -208,7 +208,7 @@ class Cryptographer {
// Merges the given set of encrypted types with the existing set and emits a
// notification if necessary.
- void MergeEncryptedTypes(syncer::ModelTypeSet encrypted_types);
+ void MergeEncryptedTypes(ModelTypeSet encrypted_types);
void EmitEncryptedTypesChangedNotification();
@@ -240,7 +240,7 @@ class Cryptographer {
scoped_ptr<sync_pb::EncryptedData> pending_keys_;
- syncer::ModelTypeSet encrypted_types_;
+ ModelTypeSet encrypted_types_;
bool encrypt_everything_;
DISALLOW_COPY_AND_ASSIGN(Cryptographer);
« no previous file with comments | « sync/tools/sync_listen_notifications.cc ('k') | sync/util/cryptographer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698