Add controlled setting indicators for content settings

chrome/browser/resources/options/content_settings.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() {
   /** @const */ var OptionsPage = options.OptionsPage;
 
   //////////////////////////////////////////////////////////////////////////////
   // ContentSettings class:
 
@@ skipping 80 matching lines @@
     document.querySelector(selector).checked = true;
   };
 
   /**
    * Sets the values for all the content settings radios.
    * @param {Object} dict A mapping from radio groups to the checked value for
    *     that group.
    */
   ContentSettings.setContentFilterSettingsValue = function(dict) {
     for (var group in dict) {
+      var managedBy = dict[group].managedBy;
+      var controlledBy = managedBy == 'policy' || managedBy == 'extension' ?
+          managedBy : null;
       document.querySelector('input[type=radio][name=' + group + '][value=' +
                              dict[group].value + ']').checked = true;
       var radios = document.querySelectorAll('input[type=radio][name=' +
                                              group + ']');
-      var managedBy = dict[group]['managedBy'];
       for (var i = 0, len = radios.length; i < len; i++) {
         radios[i].disabled = (managedBy != 'default');
-        radios[i].controlledBy = managedBy;
+        radios[i].controlledBy = controlledBy;
       }
+      var indicators = document.querySelectorAll(
+          'span.controlled-setting-indicator[content-setting=' + group + ']');
+      if (indicators.length == 0)
+        continue;
+      // Create a synthetic pref change event decorated as
+      // CoreOptionsHandler::CreateValueForPref() does.
+      var event = new cr.Event(group);
+      event.value = {
+        value: dict[group].value,
+        controlledBy: controlledBy,
+      };
+      for (var i = 0; i < indicators.length; i++)
+        indicators[i].handlePrefChange(event);
     }
     OptionsPage.updateManagedBannerVisibility();
   };
 
   /**
    * Initializes an exceptions list.
    * @param {string} type The content type that we are setting exceptions for.
    * @param {Array} list An array of pairs, where the first element of each pair
    *     is the filter string, and the second is the setting (allow/block).
    */
@@ skipping 47 matching lines @@
     $('pepper-flash-cameramic-section').style.display = '';
     $('pepper-flash-cameramic-exceptions-div').style.display = '';
   }
 
   // Export
   return {
     ContentSettings: ContentSettings
   };
 
 });