Commit 4aa66497 authored by yilkal's avatar yilkal Committed by Commit Bot

Controlled by CHILD_RESTRICTION

This CL corrects settings_private.idl and prefs_util.cc so that
it is consistent with the javascript implementation.

Bug: 945082
Change-Id: I29777701297057d9cf262fb235ccb4291e4d699e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1724814Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Commit-Queue: Yilkal Abe <yilkal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681910}
parent 2fdb1bb3
...@@ -773,7 +773,7 @@ std::unique_ptr<settings_api::PrefObject> PrefsUtil::GetPref( ...@@ -773,7 +773,7 @@ std::unique_ptr<settings_api::PrefObject> PrefsUtil::GetPref(
if (IsRestrictedCrosSettingForChildUser(profile_, name)) { if (IsRestrictedCrosSettingForChildUser(profile_, name)) {
pref_object->controlled_by = pref_object->controlled_by =
settings_api::ControlledBy::CONTROLLED_BY_CHILD_RESTRICTIONS; settings_api::ControlledBy::CONTROLLED_BY_CHILD_RESTRICTION;
pref_object->enforcement = settings_api::Enforcement::ENFORCEMENT_ENFORCED; pref_object->enforcement = settings_api::Enforcement::ENFORCEMENT_ENFORCED;
pref_object->value = std::make_unique<base::Value>( pref_object->value = std::make_unique<base::Value>(
GetRestrictedCrosSettingValueForChildUser(profile_, name)->Clone()); GetRestrictedCrosSettingValueForChildUser(profile_, name)->Clone());
......
...@@ -20,7 +20,7 @@ namespace settingsPrivate { ...@@ -20,7 +20,7 @@ namespace settingsPrivate {
// Preferences are controlled neither by parent nor the child user. // Preferences are controlled neither by parent nor the child user.
// Preference values are hard-coded values and can not be changed. // Preference values are hard-coded values and can not be changed.
CHILD_RESTRICTIONS CHILD_RESTRICTION
}; };
enum Enforcement { ENFORCED, RECOMMENDED }; enum Enforcement { ENFORCED, RECOMMENDED };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment