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

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

Issue 1155443009: [Sync] Rename SyncActive to IsSyncActive. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More non-android cases. 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/password_store_factory.cc
diff --git a/chrome/browser/password_manager/password_store_factory.cc b/chrome/browser/password_manager/password_store_factory.cc
index eb6a22c83b9ef51dfe9bfb73949e501a4d65c3a9..76bc7115ec70059aa0fe8e7c0c6253e86dd8755a 100644
--- a/chrome/browser/password_manager/password_store_factory.cc
+++ b/chrome/browser/password_manager/password_store_factory.cc
@@ -99,7 +99,7 @@ bool ShouldAffiliationBasedMatchingBeActive(Profile* profile) {
ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile);
return profile_sync_service &&
profile_sync_service->IsSyncEnabledAndLoggedIn() &&
- profile_sync_service->SyncActive() &&
+ profile_sync_service->IsSyncActive() &&
profile_sync_service->GetPreferredDataTypes().Has(syncer::PASSWORDS) &&
!profile_sync_service->IsUsingSecondaryPassphrase();
}
@@ -312,8 +312,9 @@ KeyedService* PasswordStoreFactory::BuildServiceInstanceFor(
if (backend->Init()) {
VLOG(1) << "Using KWallet for password storage.";
used_backend = KWALLET;
- } else
+ } else {
backend.reset();
+ }
} else if (used_desktop_env == base::nix::DESKTOP_ENVIRONMENT_GNOME ||
used_desktop_env == base::nix::DESKTOP_ENVIRONMENT_UNITY ||
used_desktop_env == base::nix::DESKTOP_ENVIRONMENT_XFCE) {
@@ -325,8 +326,9 @@ KeyedService* PasswordStoreFactory::BuildServiceInstanceFor(
if (backend->Init()) {
VLOG(1) << "Using libsecret keyring for password storage.";
used_backend = LIBSECRET;
- } else
+ } else {
backend.reset();
+ }
}
#endif // defined(USE_LIBSECRET)
if (!backend.get()) {
@@ -336,8 +338,9 @@ KeyedService* PasswordStoreFactory::BuildServiceInstanceFor(
if (backend->Init()) {
VLOG(1) << "Using GNOME keyring for password storage.";
used_backend = GNOME_KEYRING;
- } else
+ } else {
backend.reset();
+ }
#endif // defined(USE_GNOME_KEYRING)
}
}
« no previous file with comments | « chrome/browser/password_manager/chrome_password_manager_client_unittest.cc ('k') | chrome/browser/sync/about_sync_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698