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

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

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again; base::File changes conflicted. Created 7 years, 10 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 | « chrome/browser/password_manager/password_store_x.h ('k') | chrome/browser/pepper_flash_settings_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/password_manager/password_store_x.cc
diff --git a/chrome/browser/password_manager/password_store_x.cc b/chrome/browser/password_manager/password_store_x.cc
index 2e5dc10b2f1eb9ddad34b5192b7a9b7a4283bec0..017c838e514eb9f6e3f63d230c4b86bfa9128d62 100644
--- a/chrome/browser/password_manager/password_store_x.cc
+++ b/chrome/browser/password_manager/password_store_x.cc
@@ -12,6 +12,7 @@
#include "base/logging.h"
#include "base/stl_util.h"
#include "chrome/browser/password_manager/password_store_change.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/pref_names.h"
@@ -270,11 +271,12 @@ ssize_t PasswordStoreX::MigrateLogins() {
#if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && defined(OS_POSIX)
// static
-void PasswordStoreX::RegisterUserPrefs(PrefServiceSyncable* prefs) {
+void PasswordStoreX::RegisterUserPrefs(PrefRegistrySyncable* registry) {
// Normally we should be on the UI thread here, but in tests we might not.
- prefs->RegisterBooleanPref(prefs::kPasswordsUseLocalProfileId,
- false, // default: passwords don't use local ids
- PrefServiceSyncable::UNSYNCABLE_PREF);
+ registry->RegisterBooleanPref(prefs::kPasswordsUseLocalProfileId,
+ // default: passwords don't use local ids
+ false,
+ PrefRegistrySyncable::UNSYNCABLE_PREF);
}
// static
« no previous file with comments | « chrome/browser/password_manager/password_store_x.h ('k') | chrome/browser/pepper_flash_settings_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698