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

Unified Diff: chrome/browser/password_manager/chrome_password_manager_client.cc

Issue 1134343002: [Password Manager] Fix IsEnabledSmartLockBranding (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@400674_486739_return_values_IsPasswordSyncEnabled
Patch Set: Created 5 years, 7 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/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 371752895becf0b4ac0e5e06cedc92837e772380..58854090de0deaff7ecb1ad854450d702cdb849b 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -307,16 +307,9 @@ ChromePasswordManagerClient::GetPasswordStore() const {
password_manager::PasswordSyncState
ChromePasswordManagerClient::GetPasswordSyncState() const {
- ProfileSyncService* sync_service =
+ const ProfileSyncService* sync_service =
ProfileSyncServiceFactory::GetForProfile(profile_);
- if (sync_service && sync_service->HasSyncSetupCompleted() &&
- sync_service->SyncActive() &&
- sync_service->GetActiveDataTypes().Has(syncer::PASSWORDS)) {
- return sync_service->IsUsingSecondaryPassphrase()
- ? password_manager::SYNCING_WITH_CUSTOM_PASSPHRASE
- : password_manager::SYNCING_NORMAL_ENCRYPTION;
- }
- return password_manager::NOT_SYNCING_PASSWORDS;
+ return password_manager_util::GetPasswordSyncState(sync_service);
}
void ChromePasswordManagerClient::OnLogRouterAvailabilityChanged(

Powered by Google App Engine
This is Rietveld 408576698