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

Unified Diff: sync/internal_api/public/sync_manager.h

Issue 10455012: [Sync] Add support for performing a GetKey on startup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fred's comments 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/public/sync_manager.h
diff --git a/sync/internal_api/public/sync_manager.h b/sync/internal_api/public/sync_manager.h
index 2cbbd5c8551ded2e7ac8dfc8d1f84363995e1faa..93c3787be9b44e13ebfa521db075859adce4dfec 100644
--- a/sync/internal_api/public/sync_manager.h
+++ b/sync/internal_api/public/sync_manager.h
@@ -359,6 +359,10 @@ class SyncManager {
// |user_agent| is a 7-bit ASCII string suitable for use as the User-Agent
// HTTP header. Used internally when collecting stats to classify clients.
// |sync_notifier| is owned and used to listen for notifications.
+ // |restored_key_for_bootstrapping| is the key used to boostrap the
+ // cryptographer
+ // |keystore_encryption_enabled| determines whether we enable the keystore
+ // encryption functionality in the cryptographer/nigori.
// |report_unrecoverable_error_function| may be NULL.
//
// TODO(akalin): Replace the |post_factory| parameter with a
@@ -377,6 +381,7 @@ class SyncManager {
const SyncCredentials& credentials,
scoped_ptr<SyncNotifier> sync_notifier,
const std::string& restored_key_for_bootstrapping,
+ bool keystore_encryption_enabled,
scoped_ptr<InternalComponentsFactory> internal_components_factory,
Encryptor* encryptor,
UnrecoverableErrorHandler* unrecoverable_error_handler,

Powered by Google App Engine
This is Rietveld 408576698