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

Unified Diff: sync/internal_api/base_transaction.cc

Issue 10844005: [Sync] Refactor GetEncryptedTypes usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Always trigger OnEncryptedTypesChanged on init Created 8 years, 4 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
Index: sync/internal_api/base_transaction.cc
diff --git a/sync/internal_api/base_transaction.cc b/sync/internal_api/base_transaction.cc
index 61c1f483f479e0d27f37a866da69beb298c85be8..11a8ca4321a0257211a68de25198f1ea7baac568 100644
--- a/sync/internal_api/base_transaction.cc
+++ b/sync/internal_api/base_transaction.cc
@@ -5,6 +5,7 @@
#include "sync/internal_api/public/base_transaction.h"
#include "sync/syncable/directory.h"
+#include "sync/syncable/nigori_handler.h"
#include "sync/util/cryptographer.h"
namespace syncer {
@@ -22,8 +23,9 @@ Cryptographer* BaseTransaction::GetCryptographer() const {
return directory_->GetCryptographer(this->GetWrappedTrans());
}
-ModelTypeSet GetEncryptedTypes(const BaseTransaction* trans) {
- return trans->GetCryptographer()->GetEncryptedTypes();
+ModelTypeSet BaseTransaction::GetEncryptedTypes() const {
+ return directory_->GetNigoriHandler()->GetEncryptedTypes(
+ this->GetWrappedTrans());
}
} // namespace syncer

Powered by Google App Engine
This is Rietveld 408576698