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

Unified Diff: sync/internal_api/sync_manager_impl.h

Issue 10455012: [Sync] Add support for performing a GetKey on startup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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
Index: sync/internal_api/sync_manager_impl.h
diff --git a/sync/internal_api/sync_manager_impl.h b/sync/internal_api/sync_manager_impl.h
index 783822d4c95ee833f9ab0dc7044758de5ea2166d..a9840dd747ade6ca2fdc0bf009bea01d9d616816 100644
--- a/sync/internal_api/sync_manager_impl.h
+++ b/sync/internal_api/sync_manager_impl.h
@@ -46,6 +46,7 @@ class SyncManagerImpl : public SyncManager {
const SyncCredentials& credentials,
scoped_ptr<syncer::SyncNotifier> sync_notifier,
const std::string& restored_key_for_bootstrapping,
+ bool keystore_encryption_enabled,
TestingMode testing_mode,
syncer::Encryptor* encryptor,
syncer::UnrecoverableErrorHandler* unrecoverable_error_handler,

Powered by Google App Engine
This is Rietveld 408576698