| 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(
|
|
|