chrome/browser/prefs/pref_service.cc - Issue 4876002: Create additional PrefStore for Device Management policy.

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_service.cc

Issue 4876002: Create additional PrefStore for Device Management policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review feedback 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:

Index: chrome/browser/prefs/pref_service.cc

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

index c249789ac0e92b2d9ce308771f5c64976f4d46c2..a1baf43dad641c111f39f28f172bc99edd3e52fa 100644

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

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

@@ -602,8 +602,10 @@ const Value* PrefService::Preference::GetValue() const {

}

bool PrefService::Preference::IsManaged() const {

- return pref_service_->pref_value_store_->

- PrefValueInManagedStore(name_.c_str());

+ PrefValueStore* pref_value_store =

+ pref_service_->pref_value_store_;

+ return pref_value_store->PrefValueInManagedPlatformStore(name_.c_str()) ||

+ pref_value_store->PrefValueInDeviceManagementStore(name_.c_str());

}

bool PrefService::Preference::HasExtensionSetting() const {