Clarify settings UI in multi-profiles mode

chrome/browser/resources/options/controlled_setting.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('options', function() {
   var Preferences = options.Preferences;
 
   /**
    * A controlled setting indicator that can be placed on a setting as an
    * indicator that the value is controlled by some external entity such as
@@ skipping 87 matching lines @@
         var self = this;
 
         // Construct the bubble text.
         if (this.hasAttribute('plural')) {
           var defaultStrings = {
             'policy': loadTimeData.getString('controlledSettingsPolicy'),
             'extension': loadTimeData.getString('controlledSettingsExtension'),
             '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'),
             'extension': loadTimeData.getString('controlledSettingExtension'),
             'extensionWithName': loadTimeData.getString(
                 'controlledSettingExtensionWithName'),
             'recommended':
                 loadTimeData.getString('controlledSettingRecommended'),
             'hasRecommendation':
                 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.

           }
         }
 
         // No controller, no bubble.
         if (!this.controlledBy || !(this.controlledBy in defaultStrings))
           return;
 
         var text = defaultStrings[this.controlledBy];
         if (this.controlledBy == 'extension' && this.extensionName)
           text = defaultStrings.extensionWithName;
@@ skipping 82 matching lines @@
                     cr.PropertyKind.ATTR);
 
   /**
    * The status of the associated preference:
    * - 'policy':            A specific value is enfoced by policy.
    * - 'extension':         A specific value is enforced by an extension.
    * - 'recommended':       A value is recommended by policy. The user could
    *                        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}
    */
   cr.defineProperty(ControlledSettingIndicator, 'controlledBy',
                     cr.PropertyKind.ATTR);
 
   // Export.
   return {
     ControlledSettingIndicator: ControlledSettingIndicator
   };
 });