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

Unified Diff: chrome/browser/sync/glue/sync_backend_host.cc

Issue 8356026: [Sync] Cache encrypted types info in ProfileSyncService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test failures Created 9 years, 2 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: chrome/browser/sync/glue/sync_backend_host.cc
diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc
index 20b1afc1766036c8a9234a740f3c64dc853d7f11..899585d26fda7702926e4d2678f6c743284d5cfb 100644
--- a/chrome/browser/sync/glue/sync_backend_host.cc
+++ b/chrome/browser/sync/glue/sync_backend_host.cc
@@ -504,14 +504,15 @@ void SyncBackendHost::Core::OnClearServerDataSucceeded() {
}
void SyncBackendHost::Core::OnEncryptionComplete(
- const syncable::ModelTypeSet& encrypted_types) {
+ const syncable::ModelTypeSet& encrypted_types,
+ bool encrypt_everything) {
if (!sync_loop_)
return;
DCHECK_EQ(MessageLoop::current(), sync_loop_);
host_->frontend_loop_->PostTask(
FROM_HERE,
NewRunnableMethod(this, &Core::NotifyEncryptionComplete,
- encrypted_types));
+ encrypted_types, encrypt_everything));
}
void SyncBackendHost::Core::OnActionableError(
@@ -795,11 +796,13 @@ void SyncBackendHost::Core::NotifyUpdatedToken(const std::string& token) {
}
void SyncBackendHost::Core::NotifyEncryptionComplete(
- const syncable::ModelTypeSet& encrypted_types) {
+ const syncable::ModelTypeSet& encrypted_types,
+ bool encrypt_everything) {
if (!host_)
return;
DCHECK_EQ(MessageLoop::current(), host_->frontend_loop_);
- host_->frontend_->OnEncryptionComplete(encrypted_types);
+ host_->frontend_->OnEncryptionComplete(
+ encrypted_types, encrypt_everything);
}
void SyncBackendHost::Core::HandleSyncCycleCompletedOnFrontendLoop(

Powered by Google App Engine
This is Rietveld 408576698