chrome/browser/prefs/pref_value_store.cc - 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.cc

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 comments, moved ExtensionPrefStore reference to Profile 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/test_extension_prefs.cc ('K') | « chrome/browser/extensions/test_extension_prefs.cc ('k') | chrome/browser/profile.h » ('j') | chrome/test/testing_pref_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/pref_value_store.cc

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

index 84b6919ec7067db82354d49ea8596d67b7c1a504..4ff93f4d85dd45b65d095ce5f7b54219b8ce6ded 100644

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

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

@@ -56,7 +56,7 @@ PrefValueStore* PrefValueStore::CreatePrefValueStore(

device_management =

ConfigurationPolicyPrefStore::CreateDeviceManagementPolicyPrefStore(

profile);

- extension = new ExtensionPrefStore(profile, PrefNotifier::EXTENSION_STORE);

+ extension = new ExtensionPrefStore(profile);

command_line = new CommandLinePrefStore(CommandLine::ForCurrentProcess());

recommended =

ConfigurationPolicyPrefStore::CreateRecommendedPolicyPrefStore();

@@ -154,7 +154,8 @@ bool PrefValueStore::PrefHasChanged(const char* path,

return true;

PrefNotifier::PrefStoreType controller = ControllingPrefStoreForPref(path);

- DCHECK(controller != PrefNotifier::INVALID_STORE);

+ DCHECK(controller != PrefNotifier::INVALID_STORE)

+ << "Invalid controller for path " << path;

if (controller == PrefNotifier::INVALID_STORE)

return true;