Clarify settings UI in multi-profiles mode

chrome/browser/resources/options/controlled_setting.js

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..abe06e704a594b2086f58af8ba6be1531cd3bd63 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'] =

[Dan Beam, 2014/02/12 21:56:31]

s/['shared']/.shared/

[michaelpg, 2014/02/13 02:15:23]

Done.

+                loadTimeData.getString('controlledSettingsShared');
+          }
         } else {
           var defaultStrings = {
             'policy': loadTimeData.getString('controlledSettingPolicy'),
@@ -117,8 +121,10 @@ cr.define('options', function() {
                 loadTimeData.getString('controlledSettingHasRecommendation'),
           };
           if (cr.isChromeOS) {
-            defaultStrings.owner =
+            defaultStrings['owner'] =

[Dan Beam, 2014/02/12 21:56:31]

revert

[michaelpg, 2014/02/13 02:15:23]

Done.

                 loadTimeData.getString('controlledSettingOwner');
+            defaultStrings['shared'] =
+                loadTimeData.getString('controlledSettingShared');

[Dan Beam, 2014/02/12 21:56:31]

s/['shared']/.shared/

[michaelpg, 2014/02/13 02:15:23]

Done.

           }
         }
 
@@ -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}
    */