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

Unified Diff: chrome/browser/ui/webui/options/core_options_handler.cc

Issue 8896023: Fixed the value of "controlledBy" for preferences when they're set by the user. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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_value_store_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/core_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc
index d03f7d79dea87b58fd38b2ff4e9ce6c83303e2ea..dcdcc04293cab8867deb21d8a21bd36a8904a88e 100644
--- a/chrome/browser/ui/webui/options/core_options_handler.cc
+++ b/chrome/browser/ui/webui/options/core_options_handler.cc
@@ -272,8 +272,7 @@ DictionaryValue* CoreOptionsHandler::CreateValueForPref(
dict->SetString("controlledBy", "policy");
} else if (controlling_pref->IsExtensionControlled()) {
dict->SetString("controlledBy", "extension");
- } else if (controlling_pref->IsUserModifiable() &&
- !controlling_pref->IsDefaultValue()) {
+ } else if (controlling_pref->IsRecommended()) {
dict->SetString("controlledBy", "recommended");
}
dict->SetBoolean("disabled", !controlling_pref->IsUserModifiable());
« no previous file with comments | « chrome/browser/prefs/pref_value_store_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698