Index: chrome/browser/sync/syncable/syncable.cc |
diff --git a/chrome/browser/sync/syncable/syncable.cc b/chrome/browser/sync/syncable/syncable.cc |
index ac66083cc5f61a3b56fd3cb00697d9e30b78143e..c3e587c0e49151cc0b46309316c537d07c1c56b6 100644 |
--- a/chrome/browser/sync/syncable/syncable.cc |
+++ b/chrome/browser/sync/syncable/syncable.cc |
@@ -38,10 +38,6 @@ |
#include "base/time.h" |
#include "chrome/browser/sync/engine/syncer.h" |
#include "chrome/browser/sync/engine/syncer_util.h" |
-#include "chrome/browser/sync/protocol/autofill_specifics.pb.h" |
-#include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" |
-#include "chrome/browser/sync/protocol/password_specifics.pb.h" |
-#include "chrome/browser/sync/protocol/preference_specifics.pb.h" |
#include "chrome/browser/sync/protocol/service_constants.h" |
#include "chrome/browser/sync/protocol/theme_specifics.pb.h" |
#include "chrome/browser/sync/protocol/typed_url_specifics.pb.h" |
@@ -278,6 +274,12 @@ DirectoryBackingStore* Directory::CreateBackingStore( |
return new DirectoryBackingStore(dir_name, backing_filepath); |
} |
+void Directory::SetEncryptedDataTypes(const ModelTypeSet& encrypted_types) { |
+ // Sanity check, passwords should always be encrypted. |
+ DCHECK(encrypted_types.count(syncable::PASSWORDS) > 0); |
+ kernel_->encrypted_datatypes = encrypted_types; |
+} |
+ |
DirOpenResult Directory::OpenImpl(const FilePath& file_path, |
const string& name) { |
DCHECK_EQ(static_cast<DirectoryBackingStore*>(NULL), store_); |
@@ -1103,6 +1105,11 @@ BaseTransaction::BaseTransaction(Directory* directory) |
BaseTransaction::~BaseTransaction() {} |
+void BaseTransaction::SetEncryptedDataTypes( |
+ const ModelTypeSet& encrypted_types) { |
+ directory()->SetEncryptedDataTypes(encrypted_types); |
+} |
+ |
void BaseTransaction::UnlockAndLog(OriginalEntries* originals_arg) { |
// Triggers the CALCULATE_CHANGES and TRANSACTION_ENDING events while |
// holding dir_kernel_'s transaction_mutex and changes_channel mutex. |