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

Unified Diff: sync/sessions/sync_session_context.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/sessions/sync_session_context.h
diff --git a/sync/sessions/sync_session_context.h b/sync/sessions/sync_session_context.h
index 400a6aaf0bbd05c8783f496601753daad7d0b8d5..3f01150f398082932a0e9fd05667816fb2fd9eb8 100644
--- a/sync/sessions/sync_session_context.h
+++ b/sync/sessions/sync_session_context.h
@@ -56,7 +56,9 @@ class SyncSessionContext {
ThrottledDataTypeTracker* throttled_data_type_tracker,
const std::vector<SyncEngineEventListener*>& listeners,
DebugInfoGetter* debug_info_getter,
- TrafficRecorder* traffic_recorder);
+ TrafficRecorder* traffic_recorder,
+ bool keystore_encryption_enabled);
+
~SyncSessionContext();
ConflictResolver* resolver() { return resolver_; }
@@ -118,6 +120,10 @@ class SyncSessionContext {
return traffic_recorder_;
}
+ bool keystore_encryption_enabled() const {
+ return keystore_encryption_enabled_;
+ }
+
private:
// Rather than force clients to set and null-out various context members, we
// extend our encapsulation boundary to scoped helpers that take care of this
@@ -162,6 +168,11 @@ class SyncSessionContext {
TrafficRecorder* traffic_recorder_;
+ // Temporary variable while keystore encryption is behind a flag. True if
+ // we should attempt performing keystore encryption related work, false if
+ // the experiment is not enabled.
+ bool keystore_encryption_enabled_;
+
DISALLOW_COPY_AND_ASSIGN(SyncSessionContext);
};

Powered by Google App Engine
This is Rietveld 408576698