chrome/browser/prefs/pref_value_store.h - Issue 5213002: Fix for Bug 50726 "Save extension list and "winning" prefs from extensions"

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/pref_value_store.h

Issue 5213002: Fix for Bug 50726 "Save extension list and "winning" prefs from extensions" (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Addressed (first set of) comments by Mattias Created 10 years, 1 month 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

« chrome/browser/extensions/extension_prefs_unittest.cc ('K') | « chrome/browser/extensions/test_extension_prefs.cc ('k') | chrome/browser/prefs/pref_value_store.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/pref_value_store.h

diff --git a/chrome/browser/prefs/pref_value_store.h b/chrome/browser/prefs/pref_value_store.h

index 87ed7b26b635cbfb6517d0b6d316a3d22c395e49..7666d6ea0d8205e2a8d787a04d607faac7268989 100644

--- a/chrome/browser/prefs/pref_value_store.h

+++ b/chrome/browser/prefs/pref_value_store.h

@@ -172,7 +172,14 @@ class PrefValueStore : public base::RefCountedThreadSafe<PrefValueStore> {

// that conflict with proxy settings specified by proxy policy.

bool HasPolicyConflictingUserProxySettings();

- protected:

+ // Replaces the internal link to the extension preferences store and takes

+ // ownership of |extension_prefs|.

+ void ReplaceExtensionPrefStore(PrefStore* extension_prefs);

+ // Returns a reference to the extension pref store for write access.

+ PrefStore* GetExtensionPrefStore();

+ protected:

// In decreasing order of precedence:

// |managed_platform_prefs| contains all managed platform (non-cloud policy)

// preference values.