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

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

Issue 9669057: Use PasswordStoreDefault on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a143c28ade0060238de2d7da5ee172954d82b450..7ee76d7d74971c920dc25ebf3f41c976a8e7437d 100644
--- a/chrome/browser/password_manager/password_store_factory.cc
+++ b/chrome/browser/password_manager/password_store_factory.cc
@@ -112,12 +112,11 @@ RefcountedProfileKeyedService* PasswordStoreFactory::BuildServiceInstanceFor(
} else {
ps = new PasswordStoreMac(new MacKeychain(), login_db);
}
-#elif defined(OS_CHROMEOS)
+#elif defined(OS_CHROMEOS) || defined(OS_ANDROID)
// For now, we use PasswordStoreDefault. We might want to make a native
// backend for PasswordStoreX (see below) in the future though.
ps = new PasswordStoreDefault(
- login_db, profile,
- profile->GetWebDataService(Profile::IMPLICIT_ACCESS));
+ login_db, profile, profile->GetWebDataService(Profile::IMPLICIT_ACCESS));
#elif defined(OS_POSIX)
// On POSIX systems, we try to use the "native" password management system of
// the desktop environment currently running, allowing GNOME Keyring in XFCE.
@@ -189,7 +188,8 @@ RefcountedProfileKeyedService* PasswordStoreFactory::BuildServiceInstanceFor(
}
void PasswordStoreFactory::RegisterUserPrefs(PrefService* prefs) {
-#if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && defined(OS_POSIX)
+#if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) \
+ && defined(OS_POSIX)
prefs->RegisterIntegerPref(prefs::kLocalProfileId,
kInvalidLocalProfileId,
PrefService::UNSYNCABLE_PREF);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698