chrome/browser/prefs/profile_pref_store_manager.cc - Issue 347793002: Expand the JsonPrefStore's interface to allow for an alternate filename to be specified.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: 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

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..1ce6a83b804dc56efdbc18d0ace0dfdb1f229087 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::kDeprecatedProtectedPreferencesFilename),

io_task_runner,

protected_pref_hash_filter.PassAs<PrefFilter>()));

« base/prefs/json_pref_store.h ('K') | « base/prefs/json_pref_store_unittest.cc ('k') | chrome/common/chrome_constants.h » ('j') | chrome/common/chrome_constants.h » ('J')