Chromium Code Reviews| Index: chrome/browser/password_manager/chrome_password_manager_client.cc |
| diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc |
| index fee36e2697e784cae429a022077d5856577e18ad..5ae435a113ce9e7fd61926fd9753d9e3d4517bab 100644 |
| --- a/chrome/browser/password_manager/chrome_password_manager_client.cc |
| +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc |
| @@ -137,8 +137,13 @@ ChromePasswordManagerClient::GetProbabilityForExperiment( |
| bool ChromePasswordManagerClient::IsPasswordSyncEnabled() { |
| ProfileSyncService* sync_service = |
| ProfileSyncServiceFactory::GetForProfile(GetProfile()); |
| - if (sync_service && sync_service->HasSyncSetupCompleted()) |
| + // Don't consider sync enabled if the user has a custom passphrase. See |
| + // crbug.com/358998 for more details. |
| + if (sync_service && |
| + sync_service->HasSyncSetupCompleted() && |
|
Nicolas Zea
2014/04/16 17:25:32
It turns out this actually also needs to check syn
|
| + !sync_service->IsUsingSecondaryPassphrase()) { |
| return sync_service->GetActiveDataTypes().Has(syncer::PASSWORDS); |
| + } |
| return false; |
| } |