| Index: chrome/browser/resources/options/controlled_setting.js
|
| diff --git a/chrome/browser/resources/options/controlled_setting.js b/chrome/browser/resources/options/controlled_setting.js
|
| index bbf1de8fe945636401800ceaaf6ce4f3ed889665..9545952d9aa1b708b530f991562a7492b4c6d281 100644
|
| --- a/chrome/browser/resources/options/controlled_setting.js
|
| +++ b/chrome/browser/resources/options/controlled_setting.js
|
| @@ -105,6 +105,10 @@ cr.define('options', function() {
|
| 'extensionWithName': loadTimeData.getString(
|
| 'controlledSettingsExtensionWithName'),
|
| };
|
| + if (cr.isChromeOS) {
|
| + defaultStrings['shared'] =
|
| + loadTimeData.getString('controlledSettingsShared');
|
| + }
|
| } else {
|
| var defaultStrings = {
|
| 'policy': loadTimeData.getString('controlledSettingPolicy'),
|
| @@ -117,7 +121,7 @@ cr.define('options', function() {
|
| loadTimeData.getString('controlledSettingHasRecommendation'),
|
| };
|
| if (cr.isChromeOS) {
|
| - defaultStrings.owner =
|
| + defaultStrings['owner'] =
|
| loadTimeData.getString('controlledSettingOwner');
|
| }
|
| }
|
| @@ -221,6 +225,10 @@ cr.define('options', function() {
|
| * override this recommendation but has not done so.
|
| * - 'hasRecommendation': A value is recommended by policy. The user has
|
| * overridden this recommendation.
|
| + * - 'owner': A value is controlled by the owner of the device
|
| + * (Chrome OS only).
|
| + * - 'shared': A value belongs to the primary user but can be
|
| + * modified (Chrome OS only).
|
| * - unset: The value is controlled by the user alone.
|
| * @type {string}
|
| */
|
|
|