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

Unified Diff: sync/sessions/sync_session_context.cc

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/sessions/sync_session_context.cc
diff --git a/sync/sessions/sync_session_context.cc b/sync/sessions/sync_session_context.cc
index 8edb458f6d14de95b4737141e2e586affebfb616..e561ad2ce32be9f9764fcbf1b1bf32aed2ca8631 100644
--- a/sync/sessions/sync_session_context.cc
+++ b/sync/sessions/sync_session_context.cc
@@ -23,7 +23,8 @@ SyncSessionContext::SyncSessionContext(
ThrottledDataTypeTracker* throttled_data_type_tracker,
const std::vector<SyncEngineEventListener*>& listeners,
DebugInfoGetter* debug_info_getter,
- syncer::TrafficRecorder* traffic_recorder)
+ syncer::TrafficRecorder* traffic_recorder,
+ bool keystore_encryption_enabled)
: resolver_(NULL),
connection_manager_(connection_manager),
directory_(directory),
@@ -34,7 +35,8 @@ SyncSessionContext::SyncSessionContext(
max_commit_batch_size_(kDefaultMaxCommitBatchSize),
throttled_data_type_tracker_(throttled_data_type_tracker),
debug_info_getter_(debug_info_getter),
- traffic_recorder_(traffic_recorder) {
+ traffic_recorder_(traffic_recorder),
+ keystore_encryption_enabled_(keystore_encryption_enabled) {
std::vector<SyncEngineEventListener*>::const_iterator it;
for (it = listeners.begin(); it != listeners.end(); ++it)
listeners_.AddObserver(*it);

Powered by Google App Engine
This is Rietveld 408576698