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

Unified Diff: chrome/browser/extensions/api/settings_private/prefs_util.cc

Issue 2861393003: MD Settings: Always provide recommended meta-data (Closed)
Patch Set: Use non cros specific pref for tests Created 3 years, 7 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
« no previous file with comments | « no previous file | chrome/browser/extensions/api/settings_private/settings_private_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/settings_private/prefs_util.cc
diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
index 0fc48347369a46b4cabb03079148fa46471fc665..11983b56bf933b4dedf1d6b1726b680b3b6cd0bc 100644
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -478,13 +478,16 @@ std::unique_ptr<settings_private::PrefObject> PrefsUtil::GetPref(
return pref_object;
}
- if (pref && pref->IsRecommended()) {
+ // A pref is recommended if it has a recommended value, regardless of whether
+ // the current value is set by policy. The UI will test to see whether the
+ // current value matches the recommended value and inform the user.
+ const base::Value* recommended = pref ? pref->GetRecommendedValue() : nullptr;
+ if (recommended) {
pref_object->controlled_by =
settings_private::ControlledBy::CONTROLLED_BY_USER_POLICY;
pref_object->enforcement =
settings_private::Enforcement::ENFORCEMENT_RECOMMENDED;
- pref_object->recommended_value.reset(
- pref->GetRecommendedValue()->DeepCopy());
+ pref_object->recommended_value.reset(recommended->DeepCopy());
return pref_object;
}
« no previous file with comments | « no previous file | chrome/browser/extensions/api/settings_private/settings_private_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698