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

Unified Diff: chrome/browser/resources/options/controlled_setting.js

Issue 152143009: Clarify settings UI in multi-profiles mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase... Created 6 years, 10 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
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..17048d43067cf092193f78c76d1cc635c1d8434e 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'),
@@ -119,6 +123,8 @@ cr.define('options', function() {
if (cr.isChromeOS) {
defaultStrings.owner =
loadTimeData.getString('controlledSettingOwner');
+ defaultStrings.shared =
+ loadTimeData.getString('controlledSettingShared');
}
}
@@ -221,6 +227,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}
*/
« no previous file with comments | « chrome/browser/resources/options/controlled_setting.css ('k') | chrome/browser/resources/options/language_options.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698