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

Unified Diff: chrome/browser/sync/engine/update_applicator.h

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/engine/syncer_util.cc ('k') | chrome/browser/sync/engine/update_applicator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/update_applicator.h
diff --git a/chrome/browser/sync/engine/update_applicator.h b/chrome/browser/sync/engine/update_applicator.h
index 7073f0ae9e364827eff9c6c0eead9b7381e103b0..eb8b97cf9dc94aea89155e8b82fda535339ea518 100644
--- a/chrome/browser/sync/engine/update_applicator.h
+++ b/chrome/browser/sync/engine/update_applicator.h
@@ -27,6 +27,7 @@ class UpdateProgress;
}
class ConflictResolver;
+class Cryptographer;
class UpdateApplicator {
public:
@@ -34,6 +35,7 @@ class UpdateApplicator {
UpdateIterator;
UpdateApplicator(ConflictResolver* resolver,
+ Cryptographer* cryptographer,
const UpdateIterator& begin,
const UpdateIterator& end,
const ModelSafeRoutingInfo& routes,
@@ -62,6 +64,9 @@ class UpdateApplicator {
// Used to resolve conflicts when trying to apply updates.
ConflictResolver* const resolver_;
+ // Used to decrypt sensitive sync nodes.
+ Cryptographer* cryptographer_;
+
UpdateIterator const begin_;
UpdateIterator end_;
UpdateIterator pointer_;
« no previous file with comments | « chrome/browser/sync/engine/syncer_util.cc ('k') | chrome/browser/sync/engine/update_applicator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698