Commit 5959e98f authored by Mikel Astiz's avatar Mikel Astiz Committed by Commit Bot

Fix sync setup UI not updated when passphrase entered

This fixes a regression introduced in
https://chromium-review.googlesource.com/1152812 due to an accidental
behavioral change that dropped a notification to observers when the
sync setup UI is opened (i.e. SyncServiceCrypto::OnPassphraseAccepted()
always notified observers prior to the offending patch).

This patch reverts that behavioral change.

Bug: 870256
Change-Id: If51618607c85aee806f982680b5eb83b77b5c615
Reviewed-on: https://chromium-review.googlesource.com/1166904
Commit-Queue: Mikel Astiz <mastiz@chromium.org>
Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#581542}
parent d4060a2f
...@@ -2256,12 +2256,14 @@ void ProfileSyncService::OnSetupInProgressHandleDestroyed() { ...@@ -2256,12 +2256,14 @@ void ProfileSyncService::OnSetupInProgressHandleDestroyed() {
void ProfileSyncService::ReconfigureDueToPassphrase( void ProfileSyncService::ReconfigureDueToPassphrase(
syncer::ConfigureReason reason) { syncer::ConfigureReason reason) {
if (!CanConfigureDataTypes()) { if (CanConfigureDataTypes()) {
return; DCHECK(data_type_manager_->IsNigoriEnabled());
ConfigureDataTypeManager(reason);
} }
DCHECK(data_type_manager_->IsNigoriEnabled()); // Notify observers that the passphrase status may have changed, regardless of
ConfigureDataTypeManager(reason); // whether we triggered configuration or not. This is needed for the
// Notify observers that the passphrase status may have changed. // IsSetupInProgress() case where the UI needs to be updated to reflect that
// the passphrase was accepted (https://crbug.com/870256).
NotifyObservers(); NotifyObservers();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment