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

Issues Search
    My Issues | Starred     Open | Closed | All

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: fix nits 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
« no previous file with comments | « chrome/browser/prefs/pref_notifier_unittest.cc ('k') | chrome/browser/prefs/pref_service_unittest.cc » ('j') | chrome/browser/prefs/pref_value_store.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 {
« no previous file with comments | « chrome/browser/prefs/pref_notifier_unittest.cc ('k') | chrome/browser/prefs/pref_service_unittest.cc » ('j') | chrome/browser/prefs/pref_value_store.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698