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

Unified Diff: chrome/browser/sync/syncable/directory_manager.cc

Issue 2828021: Take 2: sync changes to support encryption (Closed)
Patch Set: fix flaky password test under valgrind Created 10 years, 6 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 | « chrome/browser/sync/syncable/directory_manager.h ('k') | chrome/browser/sync/syncable/model_type.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/syncable/directory_manager.cc
diff --git a/chrome/browser/sync/syncable/directory_manager.cc b/chrome/browser/sync/syncable/directory_manager.cc
index 96578c0e8c151c56c12e7cc18e6ca7254c7ec1dd..0719c67f9235b8c9764cbae732f0abadf15e4ffe 100644
--- a/chrome/browser/sync/syncable/directory_manager.cc
+++ b/chrome/browser/sync/syncable/directory_manager.cc
@@ -14,6 +14,8 @@
#include "chrome/browser/sync/syncable/syncable.h"
#include "chrome/common/deprecated/event_sys-inl.h"
+using browser_sync::Cryptographer;
+
namespace syncable {
static const FilePath::CharType kSyncDataDatabaseFilename[] =
@@ -37,7 +39,8 @@ const FilePath DirectoryManager::GetSyncDataDatabasePath() const {
DirectoryManager::DirectoryManager(const FilePath& path)
: root_path_(path),
managed_directory_(NULL),
- channel_(new Channel(DirectoryManagerShutdownEvent())) {
+ channel_(new Channel(DirectoryManagerShutdownEvent())),
+ cryptographer_(new Cryptographer) {
}
DirectoryManager::~DirectoryManager() {
« no previous file with comments | « chrome/browser/sync/syncable/directory_manager.h ('k') | chrome/browser/sync/syncable/model_type.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698