| Index: chrome/browser/sync/engine/syncapi.cc
|
| diff --git a/chrome/browser/sync/engine/syncapi.cc b/chrome/browser/sync/engine/syncapi.cc
|
| index 229d3429318292478f51366840d7e527b4e0e875..465be68d256319dabdeafac9cb7ef76ac73bb322 100644
|
| --- a/chrome/browser/sync/engine/syncapi.cc
|
| +++ b/chrome/browser/sync/engine/syncapi.cc
|
| @@ -1641,6 +1641,12 @@ SyncManager::Observer::~Observer() {}
|
| SyncManager::SyncManager(const std::string& name)
|
| : data_(new SyncInternal(name)) {}
|
|
|
| +SyncManager::Status::Status() {
|
| +}
|
| +
|
| +SyncManager::Status::~Status() {
|
| +}
|
| +
|
| bool SyncManager::Init(
|
| const FilePath& database_location,
|
| const WeakHandle<JsEventHandler>& event_handler,
|
| @@ -1865,6 +1871,9 @@ bool SyncManager::SyncInternal::UpdateCryptographerFromNigori() {
|
| OnPassphraseRequired(sync_api::REASON_DECRYPTION));
|
| }
|
|
|
| + allstatus_.SetCryptographerReady(cryptographer->is_ready());
|
| + allstatus_.SetCryptoHasPendingKeys(cryptographer->has_pending_keys());
|
| +
|
| return cryptographer->is_ready();
|
| }
|
|
|
| @@ -2102,6 +2111,7 @@ void SyncManager::SyncInternal::EncryptDataTypes(
|
| encrypted_types.begin(), encrypted_types.end(),
|
| std::inserter(newly_encrypted_types,
|
| newly_encrypted_types.begin()));
|
| + allstatus_.SetEncryptedTypes(newly_encrypted_types);
|
| if (newly_encrypted_types == current_encrypted_types)
|
| return; // Set of encrypted types did not change.
|
| syncable::FillNigoriEncryptedTypes(newly_encrypted_types, &nigori);
|
| @@ -2560,6 +2570,11 @@ void SyncManager::SyncInternal::OnSyncEngineEvent(
|
| FOR_EACH_OBSERVER(SyncManager::Observer, temp_obs_list,
|
| OnPassphraseRequired(sync_api::REASON_ENCRYPTION));
|
| }
|
| +
|
| + allstatus_.SetCryptographerReady(cryptographer->is_ready());
|
| + allstatus_.SetCryptoHasPendingKeys(cryptographer->has_pending_keys());
|
| + allstatus_.SetEncryptedTypes(cryptographer->GetEncryptedTypes());
|
| +
|
| // If everything is in order(we have the passphrase) then there is no
|
| // need to inform the listeners. They will just wait for sync
|
| // completion event and if no errors have been raised it means
|
|
|