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

Unified Diff: chrome/browser/prefs/profile_pref_store_manager.cc

Issue 347793002: Expand the JsonPrefStore's interface to allow for an alternate filename to be specified. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Dont even attempt to delete the alternate file in unexpected situations. Created 6 years, 6 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 | « base/prefs/json_pref_store_unittest.cc ('k') | chrome/common/chrome_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/profile_pref_store_manager.cc
diff --git a/chrome/browser/prefs/profile_pref_store_manager.cc b/chrome/browser/prefs/profile_pref_store_manager.cc
index 96fce2959edb80955c077d1a008e45280cb56f2d..b6d1417e911c976078ff7dadf1adc8a5d1651b63 100644
--- a/chrome/browser/prefs/profile_pref_store_manager.cc
+++ b/chrome/browser/prefs/profile_pref_store_manager.cc
@@ -157,8 +157,11 @@ PersistentPrefStore* ProfilePrefStoreManager::CreateProfilePrefStore(
new JsonPrefStore(GetPrefFilePathFromProfilePath(profile_path_),
io_task_runner,
unprotected_pref_hash_filter.PassAs<PrefFilter>()));
+ // TODO(gab): Remove kDeprecatedProtectedPreferencesFilename as an alternate
+ // file in M40+.
scoped_refptr<JsonPrefStore> protected_pref_store(new JsonPrefStore(
- profile_path_.Append(chrome::kProtectedPreferencesFilename),
+ profile_path_.Append(chrome::kSecurePreferencesFilename),
+ profile_path_.Append(chrome::kProtectedPreferencesFilenameDeprecated),
io_task_runner,
protected_pref_hash_filter.PassAs<PrefFilter>()));
« no previous file with comments | « base/prefs/json_pref_store_unittest.cc ('k') | chrome/common/chrome_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698